From eb1698dd2a57573b9295ffbe541a9b5eee25dc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 13 Mar 2021 21:09:40 +0100 Subject: [PATCH] Fix Control::_edit_set_state bogus error check My mistake when cherry-picking #46699 with f8ee8b1b7344db274d6830b25a9760e02de0a0a6, I forgot to amend the cherry-pick to change 'offsets' back to 'margins' for the 3.2 branch. Fixes #46979. --- scene/gui/control.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 5d482ad6885..aa6a1ad122f 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -72,7 +72,7 @@ Dictionary Control::_edit_get_state() const { void Control::_edit_set_state(const Dictionary &p_state) { ERR_FAIL_COND((p_state.size() <= 0) || !p_state.has("rotation") || !p_state.has("scale") || - !p_state.has("pivot") || !p_state.has("anchors") || !p_state.has("offsets")); + !p_state.has("pivot") || !p_state.has("anchors") || !p_state.has("margins")); Dictionary state = p_state; set_rotation(state["rotation"]);