diff options
| author | Juan Linietsky | 2014-12-21 11:42:44 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-12-21 11:42:44 -0300 |
| commit | f7f197c40941ffaf03fcddeb20536dec8074ca00 (patch) | |
| tree | 7a69483162bb873813f6152176b815d189af4edd /scene/gui/box_container.cpp | |
| parent | 9783f6fc969947fdbf666950ab3da21ac462c57e (diff) | |
| download | godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.tar.gz godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.tar.zst godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.zip | |
-ability to set default textures in shader (needed for visual shader editing)
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
Diffstat (limited to 'scene/gui/box_container.cpp')
| -rw-r--r-- | scene/gui/box_container.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index 216c6d712..5ed60e88f 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -44,7 +44,7 @@ void BoxContainer::_resort() { Size2i new_size=get_size();; - int sep=get_constant("separation",vertical?"VBoxContainer":"HBoxContainer"); + int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer"); bool first=true; int children_count=0; @@ -202,7 +202,7 @@ Size2 BoxContainer::get_minimum_size() const { /* Calculate MINIMUM SIZE */ Size2i minimum; - int sep=get_constant("separation",vertical?"VBoxContainer":"HBoxContainer"); + int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer"); bool first=true; |