Compare commits
No commits in common. "81b35476a0ea17c55f65f49753bbfb00d4832569" and "aff84ccc96c259758c5395e2acb432b3eaba0ae2" have entirely different histories.
81b35476a0
...
aff84ccc96
2 changed files with 1 additions and 5 deletions
|
@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 14)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
set(SAVETOOL_PROJECT_VERSION 1.4.2)
|
set(SAVETOOL_PROJECT_VERSION 1.4.1)
|
||||||
|
|
||||||
find_package(Corrade REQUIRED Main Containers Utility)
|
find_package(Corrade REQUIRED Main Containers Utility)
|
||||||
find_package(Magnum REQUIRED GL Sdl2Application)
|
find_package(Magnum REQUIRED GL Sdl2Application)
|
||||||
|
|
|
@ -458,7 +458,6 @@ auto Profile::setResource(Containers::StringView container, MaterialID id, Int a
|
||||||
if(!mats_prop) {
|
if(!mats_prop) {
|
||||||
mats_prop = new ArrayProperty;
|
mats_prop = new ArrayProperty;
|
||||||
mats_prop->name.emplace(container);
|
mats_prop->name.emplace(container);
|
||||||
mats_prop->itemType = "StructProperty";
|
|
||||||
_profile.appendProperty(ArrayProperty::ptr{mats_prop});
|
_profile.appendProperty(ArrayProperty::ptr{mats_prop});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -472,9 +471,6 @@ auto Profile::setResource(Containers::StringView container, MaterialID id, Int a
|
||||||
ResourceItemValue* res_prop;
|
ResourceItemValue* res_prop;
|
||||||
if(it == mats_prop->items.end()) {
|
if(it == mats_prop->items.end()) {
|
||||||
res_prop = new ResourceItemValue;
|
res_prop = new ResourceItemValue;
|
||||||
if(mats_prop->items.isEmpty()) {
|
|
||||||
res_prop->name.emplace("ResourceMaterial");
|
|
||||||
}
|
|
||||||
res_prop->id = id;
|
res_prop->id = id;
|
||||||
ResourceItemValue::ptr prop{res_prop};
|
ResourceItemValue::ptr prop{res_prop};
|
||||||
arrayAppend(mats_prop->items, std::move(prop));
|
arrayAppend(mats_prop->items, std::move(prop));
|
||||||
|
|
Loading…
Reference in a new issue