From 1798bf003b853189ae80dfd839f496d7d6a5273d Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 21 Dec 2020 11:37:10 +0100
Subject: [PATCH] Fix editing overridden particle emitter parameter in particle
 system window

---
 .../Editor/Windows/Assets/ParticleSystemWindow.cs  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
index 55892b461..d11e39d95 100644
--- a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
+++ b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
@@ -377,13 +377,21 @@ namespace FlaxEditor.Windows.Assets
         {
             MarkAsEdited();
             UpdateToolstrip();
-            _propertiesEditor1.BuildLayoutOnUpdate();
-            _propertiesEditor2.BuildLayoutOnUpdate();
+
+            if (!_isEditingInstancedParameterValue)
+            {
+                _propertiesEditor1.BuildLayoutOnUpdate();
+                _propertiesEditor2.BuildLayoutOnUpdate();
+            }
         }
 
         private void OnTimelineModified()
         {
-            _tmpParticleSystemIsDirty = true;
+            if (!_isEditingInstancedParameterValue)
+            {
+                _tmpParticleSystemIsDirty = true;
+            }
+
             MarkAsEdited();
         }