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

2024-08-22 17:33:20 +02:00
parent ce1a1d6031 3ecb7c1d81
commit 20456d95e8
24 changed files with 269 additions and 88 deletions
--- a/Source/Engine/Particles/ParticleEmitter.cpp
+++ b/Source/Engine/Particles/ParticleEmitter.cpp
@@ -219,7 +219,7 @@ Asset::LoadResult ParticleEmitter::load()
        ClearDependencies();
        for (const auto& node : Graph.Nodes)
        {
-            if (node.Type == GRAPH_NODE_MAKE_TYPE(14, 300))
+            if (node.Type == GRAPH_NODE_MAKE_TYPE(14, 300) && node.Assets.Count() > 0)
            {
                const auto function = node.Assets[0].As<ParticleEmitterFunction>();
                if (function)