Merge remote-tracking branch 'origin/master' into 1.10

2025-03-07 23:41:02 +01:00
parent 0c0f128585 ca153e70ab
commit 5bdbbb6d38
42 changed files with 1215 additions and 130 deletions
--- a/Source/Engine/Level/Level.cpp
+++ b/Source/Engine/Level/Level.cpp
@@ -960,10 +960,12 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
                objects[i] = obj;
                if (obj)
                {
-                    obj->RegisterObject();
+                    if (!obj->IsRegistered())
+                        obj->RegisterObject();
 #if USE_EDITOR
                    // Auto-create C# objects for all actors in Editor during scene load when running in async (so main thread already has all of them)
-                    obj->CreateManaged();
+                    if (!obj->GetManagedInstance())
+                        obj->CreateManaged();
 #endif
                }
                else