fix for scene merging with custom components when one of the scenes didn't register the type
This commit is contained in:
@@ -995,6 +995,8 @@ namespace wi::scene
|
||||
{
|
||||
for (auto& entry : componentLibrary.entries)
|
||||
{
|
||||
if (other.componentLibrary.entries.count(entry.first) == 0)
|
||||
continue;
|
||||
entry.second.component_manager->Merge(*other.componentLibrary.entries[entry.first].component_manager);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 = 764;
|
||||
const int revision = 765;
|
||||
|
||||
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user