Build viewer/editor #13

Manually merged
williamjcm merged 128 commits from mass-viewer into master 2022-03-02 14:50:10 +01:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit 3ac5288f12 - Show all commits

View File

@ -585,6 +585,7 @@ void Mass::getArmourParts() {
}
if(decals_array->items.size() != 8) {
part.demoDecals = decals_array->items.size();
_demo = true;
}

View File

@ -85,6 +85,7 @@ struct ArmourPart {
std::string slot;
Int id = 0;
Containers::StaticArray<4, Int> styles{ValueInit};
UnsignedInt demoDecals = 8;
Containers::StaticArray<8, Decal> decals{ValueInit};
Containers::StaticArray<8, Accessory> accessories{ValueInit};
};