summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scene/gui/control.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 0364f73275..d7befd6e11 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1175,7 +1175,12 @@ void Control::set_anchor(Margin p_margin,AnchorType p_anchor, bool p_keep_margin
void Control::_set_anchor(Margin p_margin,AnchorType p_anchor) {
#ifdef TOOLS_ENABLED
- set_anchor(p_margin, p_anchor, EDITOR_DEF("2d_editor/keep_margins_when_changing_anchors", false));
+ SceneTree *st=OS::get_singleton()->get_main_loop()->cast_to<SceneTree>();
+ if (st && st->is_editor_hint()) {
+ set_anchor(p_margin, p_anchor, EDITOR_DEF("2d_editor/keep_margins_when_changing_anchors", false));
+ } else {
+ set_anchor(p_margin, p_anchor);
+ }
#else
set_anchor(p_margin, p_anchor);
#endif