nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Turánszki János
2024-06-09 11:08:58 +02:00
parent 76a16e8136
commit a3d3f2a642
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ComponentsWindow.cpp
+2 -1
View File
@@ -1241,7 +1241,8 @@ void ComponentsWindow::RefreshEntityTree()
// Note that PushToEntityTree will add children recursively, so this is all we need
for (auto& x : entitytree_temp_items)
{
if (!scene.hierarchy.Contains(x))
const HierarchyComponent* hier = scene.hierarchy.GetComponent(x);
if (hier == nullptr || hier->parentID == INVALID_ENTITY)
{
PushToEntityTree(x, 0);
}
WickedEngine/wiResourceManager.cpp
+1 -1
View File
@@ -1228,7 +1228,7 @@ namespace wi
};
}
if (!resource->filedata.empty() && !has_flag(flags, Flags::IMPORT_RETAIN_FILEDATA) && !has_flag(flags, Flags::IMPORT_DELAY))
if (!resource->filedata.empty() && !has_flag(resource->flags, Flags::IMPORT_RETAIN_FILEDATA) && !has_flag(flags, Flags::IMPORT_RETAIN_FILEDATA) && !has_flag(flags, Flags::IMPORT_DELAY))
{
// file data can be discarded:
resource->filedata.clear();
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wi::version
// minor features, major updates, breaking compatibility changes
const int minor = 71;
// minor bug fixes, alterations, refactors, updates
const int revision = 479;
const int revision = 480;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);