diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 17:46:29 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 17:46:29 +0200 |
| commit | 7b471068cf8e4d166d8b0569b489f595213c3b52 (patch) | |
| tree | 637f080864f133a156960c07bc7f800707b47cb5 /tools | |
| parent | d7318f69653ca090575d1243256fcafe8d9ca25f (diff) | |
| parent | 0b572b35c2a5b284f7ecae4160fccda9a0eec336 (diff) | |
Merge pull request #4612 from bojidar-bg/fix-anchor-builds
Fix #4588 (crash in Control::_set_anchor)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 475bef8b37..b9b6dc5616 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -463,6 +463,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("2d_editor/bone_color2",Color(0.75,0.75,0.75,0.9)); set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9)); set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9)); + + set("2d_editor/keep_margins_when_changing_anchors", false); set("game_window_placement/rect",0); hints["game_window_placement/rect"]=PropertyInfo(Variant::INT,"game_window_placement/rect",PROPERTY_HINT_ENUM,"Default,Centered,Custom Position,Force Maximized,Force Full Screen"); |