diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
| commit | a7875c586af74302584544d777b189f4cb85c393 (patch) | |
| tree | f4929f77383d835b5be8b6e099b9db59000af610 /modules/gridmap/grid_map_editor_plugin.cpp | |
| parent | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (diff) | |
| parent | 8c4dd8de3919b789eac1a0f030563008bdcd44f5 (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'modules/gridmap/grid_map_editor_plugin.cpp')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 140718a91a..e621a5e061 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -1192,8 +1192,8 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { undo_redo=p_editor->get_undo_redo(); int mw = EDITOR_DEF("grid_map/palette_min_width",230); - EmptyControl *ec = memnew( EmptyControl); - ec->set_minsize(Size2(mw,0)); + Control *ec = memnew( Control); + ec->set_custom_minimum_size(Size2(mw,0)); add_child(ec); |