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

# Conflicts: # Source/Engine/Core/Math/Vector3.cpp # Source/Engine/Core/Math/Vector3.h # Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp # Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp # Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
2025-03-09 09:23:42 +01:00
parent 3643ec7a58 a93085d6d6
commit bc4f3668fe
6 changed files with 39 additions and 14 deletions
--- a/Source/Engine/Content/Content.cpp
+++ b/Source/Engine/Content/Content.cpp
@@ -1292,7 +1292,8 @@ Asset* Content::LoadAsync(const Guid& id, const ScriptingTypeHandle& type)
        LOAD_FAILED();
    }
 #endif
-    result->RegisterObject();
+    if (!result->IsInternalType())
+        result->RegisterObject();

    // Register asset
    AssetsLocker.Lock();