godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash when running a game with Controls with a tools build

Browse Source 
Regression from #3997

TOOLS_ENABLED is defined, even when running from editor, but EDITOR_DEF SEGFAULTs
This commit is contained in:
Bojidar Marinov 2016-03-10 21:00:01 +02:00
parent aaad24e6fb
commit bac875be66
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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) { void Control::_set_anchor(Margin p_margin,AnchorType p_anchor) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
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)); set_anchor(p_margin, p_anchor, EDITOR_DEF("2d_editor/keep_margins_when_changing_anchors", false));
} else {
set_anchor(p_margin, p_anchor);
}
#else #else
set_anchor(p_margin, p_anchor); set_anchor(p_margin, p_anchor);
#endif #endif