mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-07 00:34:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
mfeemster
2015-05-15 18:45:15 -07:00
parent e005b4c20e
commit 2561708ae0
14 changed files with 463 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Ember/Palette.h
View File

@ -145,6 +145,7 @@ public:
{
m_Index = palette.m_Index;
m_Name = palette.m_Name;
m_Filename = palette.m_Filename;
CopyVec(m_Entries, palette.m_Entries);
return *this;
@ -204,6 +205,7 @@ public:
{
palette.m_Index = m_Index;
palette.m_Name = m_Name;
palette.m_Filename = m_Filename;
palette.m_Entries.resize(Size());
for (uint i = 0; i < Size(); i++)
@ -263,6 +265,7 @@ public:
}
palette.m_Name = m_Name;
palette.m_Filename = m_Filename;
}
else
{
@ -340,6 +343,7 @@ public:
{
palette.m_Index = m_Index;
palette.m_Name = m_Name;
palette.m_Filename = m_Filename;
if (palette.Size() != Size())
palette.m_Entries.resize(Size());
@ -574,6 +578,7 @@ public:
int m_Index;//Index in the xml palette file of this palette, use -1 for random.
string m_Name;//Name of this palette.
string m_Filename;//Name of the parent file this palette came from, can be empty.
vector<v4T> m_Entries;//Storage for the color values.
};
}