From cf7242dd8ef2b3afb01482f77b82d4e6760197bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gilles=20Roudi=C3=A8re?= <gilles.roudiere@gmail.com>
Date: Wed, 13 Oct 2021 10:45:21 +0200
Subject: [PATCH] Fix undo in inspector not working

---
 core/object/undo_redo.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp
index 905bb587a82..86e8e2525a5 100644
--- a/core/object/undo_redo.cpp
+++ b/core/object/undo_redo.cpp
@@ -118,15 +118,16 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) {
 
 			actions.write[actions.size() - 1].last_tick = ticks;
 
+			merge_mode = p_mode;
 			merging = true;
 		} else {
 			Action new_action;
 			new_action.name = p_name;
 			new_action.last_tick = ticks;
 			actions.push_back(new_action);
-		}
 
-		merge_mode = p_mode;
+			merge_mode = MERGE_DISABLE;
+		}
 	}
 
 	action_level++;