From 285a824858670f9d52dc92327819a1b010169183 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 5 May 2023 15:08:53 +0200
Subject: [PATCH] Fix crash when removing particle emitter from system that has
 old parameter override

#1044
---
 Source/Engine/Particles/ParticleSystem.cpp | 31 +++++++---------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/Source/Engine/Particles/ParticleSystem.cpp b/Source/Engine/Particles/ParticleSystem.cpp
index b04dfe0c0..6f63101b2 100644
--- a/Source/Engine/Particles/ParticleSystem.cpp
+++ b/Source/Engine/Particles/ParticleSystem.cpp
@@ -212,6 +212,12 @@ Asset::LoadResult ParticleSystem::load()
 
     int32 version;
     stream.ReadInt32(&version);
+#if USE_EDITOR
+    // Skip unused parameters
+#define SKIP_UNUSED_PARAM_OVERRIDE() if (key.First < 0 || key.First >= Emitters.Count() || Emitters[key.First] == nullptr || Emitters[key.First]->Graph.GetParameter(key.Second) == nullptr) continue
+#else
+#define SKIP_UNUSED_PARAM_OVERRIDE()
+#endif
     switch (version)
     {
     case 1:
@@ -281,13 +287,7 @@ Asset::LoadResult ParticleSystem::load()
                 stream.ReadInt32(&key.First);
                 stream.Read(key.Second);
                 stream.ReadCommonValue(&value);
-
-#if USE_EDITOR
-                // Skip unused parameters
-                if (key.First < 0 || key.First >= Emitters.Count() || Emitters[key.First]->Graph.GetParameter(key.Second) == nullptr)
-                    continue;
-#endif
-
+                SKIP_UNUSED_PARAM_OVERRIDE();
                 EmittersParametersOverrides.Add(key, Variant(value));
             }
         }
@@ -361,13 +361,7 @@ Asset::LoadResult ParticleSystem::load()
                 stream.ReadInt32(&key.First);
                 stream.Read(key.Second);
                 stream.ReadCommonValue(&value);
-
-#if USE_EDITOR
-                // Skip unused parameters
-                if (key.First < 0 || key.First >= Emitters.Count() || Emitters[key.First]->Graph.GetParameter(key.Second) == nullptr)
-                    continue;
-#endif
-
+                SKIP_UNUSED_PARAM_OVERRIDE();
                 EmittersParametersOverrides[key] = Variant(value);
             }
         }
@@ -440,13 +434,7 @@ Asset::LoadResult ParticleSystem::load()
                 stream.ReadInt32(&key.First);
                 stream.Read(key.Second);
                 stream.ReadVariant(&value);
-
-#if USE_EDITOR
-                // Skip unused parameters
-                if (key.First < 0 || key.First >= Emitters.Count() || Emitters[key.First]->Graph.GetParameter(key.Second) == nullptr)
-                    continue;
-#endif
-
+                SKIP_UNUSED_PARAM_OVERRIDE();
                 EmittersParametersOverrides[key] = value;
             }
         }
@@ -457,6 +445,7 @@ Asset::LoadResult ParticleSystem::load()
         LOG(Warning, "Unknown timeline version {0}.", version);
         return LoadResult::InvalidData;
     }
+#undef SKIP_UNUSED_PARAM_OVERRIDE
 
 #if !BUILD_RELEASE
     _debugName = StringUtils::GetFileNameWithoutExtension(GetPath());