diff --git a/WickedEngine/wiScene.cpp b/WickedEngine/wiScene.cpp index ed26a9192..a346119ae 100644 --- a/WickedEngine/wiScene.cpp +++ b/WickedEngine/wiScene.cpp @@ -7021,7 +7021,7 @@ namespace wi::scene void LoadModel2(const std::string& fileName, const XMMATRIX& transformMatrix, Entity rootEntity) { Scene scene; - LoadModel(scene, fileName, transformMatrix, rootEntity); + LoadModel2(scene, fileName, transformMatrix, rootEntity); GetScene().Merge(scene); } diff --git a/WickedEngine/wiScene.h b/WickedEngine/wiScene.h index 716a4b56e..30bf00295 100644 --- a/WickedEngine/wiScene.h +++ b/WickedEngine/wiScene.h @@ -319,6 +319,7 @@ namespace wi::scene virtual void Clear(); // Merge an other scene into this. // The contents of the other scene will be lost (and moved to this)! + // Any references to entities or components from the other scene will now reference them in this scene. virtual void Merge(Scene& other); // Similar to merge but skipping some things that are safe to skip within the Update look void MergeFastInternal(Scene& other);