Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #4007 from bojidar-bg/PR-fix-controls

Browse source 
Fix a crash when running a game with Controls with a tools build
This commit is contained in:
Rémi Verschelde 2016-03-10 22:51:31 +01:00
commit c6e57bf514
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/control.cpp
View file

@ -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