diff options
| -rw-r--r-- | bin/tests/test_string.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/animation_editor.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/plugins/animation_player_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/project_settings.cpp | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/bin/tests/test_string.cpp b/bin/tests/test_string.cpp index fe7bf4d9cf..60ef1da540 100644 --- a/bin/tests/test_string.cpp +++ b/bin/tests/test_string.cpp @@ -904,7 +904,7 @@ MainLoop* test() { OS::get_singleton()->print("***TOTALS!***\n"); OS::get_singleton()->print("*************\n"); - OS::get_singleton()->print("Passed %i of %i tests\n",count,passed); + OS::get_singleton()->print("Passed %i of %i tests\n", passed, count); return NULL; } diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index f713b9e979..2c22c81455 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -264,8 +264,8 @@ void make_default_theme() { // ToolButton Ref<StyleBox> tb_empty = memnew( StyleBoxEmpty ); - tb_empty->set_default_margin(MARGIN_LEFT,8); - tb_empty->set_default_margin(MARGIN_RIGHT,8); + tb_empty->set_default_margin(MARGIN_LEFT,6); + tb_empty->set_default_margin(MARGIN_RIGHT,6); tb_empty->set_default_margin(MARGIN_TOP,4); tb_empty->set_default_margin(MARGIN_BOTTOM,4); diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index 79a9677edd..dfb09e38fc 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -262,6 +262,9 @@ public: NodePath np=value; + if (np==NodePath()) + return; + Node* root = EditorNode::get_singleton()->get_tree()->get_root(); Node* np_node = root->get_node(np); diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 0e2977c5a1..32afd86970 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -1298,7 +1298,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { frame = memnew( SpinBox ); hb->add_child(frame); - frame->set_custom_minimum_size(Size2(80,0)); + frame->set_custom_minimum_size(Size2(60,0)); frame->set_stretch_ratio(2); frame->set_tooltip("Animation position (in seconds)."); diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index 879eb4227c..fab2d9ce5c 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -846,7 +846,7 @@ void ProjectSettings::_autoload_edited() { undo_redo->create_action("Toggle Autoload GlobalVar"); undo_redo->add_do_property(Globals::get_singleton(),base,path); undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base)); - undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); + undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these undo_redo->add_undo_method(Globals::get_singleton(),"set_order",base,order); undo_redo->add_do_method(this,"_update_autoload"); undo_redo->add_undo_method(this,"_update_autoload"); |