diff options
author | Franklin Sobrinho <franklin_gs@hotmail.com> | 2016-01-09 08:35:57 -0300 |
---|---|---|
committer | Franklin Sobrinho <franklin_gs@hotmail.com> | 2016-01-09 08:35:57 -0300 |
commit | 7fa233cd89f0bc00b5e26ced051d12d3f73ec7e8 (patch) | |
tree | 37317da03c83ac55ce78c64798131b01a071fcf1 /tools/editor | |
parent | 292e8bf0ab02cf37b6ee1759a3942a57a6a69062 (diff) |
Fix some error messages
Diffstat (limited to 'tools/editor')
-rw-r--r-- | tools/editor/animation_editor.cpp | 2 | ||||
-rw-r--r-- | tools/editor/editor_node.cpp | 1 | ||||
-rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 4 | ||||
-rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.h | 2 | ||||
-rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 8 | ||||
-rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.h | 1 |
6 files changed, 4 insertions, 14 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index 2d274dc91b..bf17b40f46 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3017,7 +3017,7 @@ void AnimationKeyEditor::set_keying(bool p_enabled) { keying=p_enabled; _update_menu(); - emit_signal("keying_changed",p_enabled); + emit_signal("keying_changed"); } diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 2f43cb5064..7dd0979452 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -3831,7 +3831,6 @@ void EditorNode::animation_editor_make_visible(bool p_visible) { } animation_editor->set_keying(p_visible); - _update_keying(); } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index bdc34d4724..56ed95fb16 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -405,9 +405,9 @@ void CanvasItemEditor::_node_removed(Node *p_node) { #endif } -void CanvasItemEditor::_keying_changed(bool p_changed) { +void CanvasItemEditor::_keying_changed() { - if (p_changed) + if (editor->get_animation_editor()->has_keying()) animation_hb->show(); else animation_hb->hide(); diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h index 91cfab9863..df24734fd7 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.h +++ b/tools/editor/plugins/canvas_item_editor_plugin.h @@ -344,7 +344,7 @@ class CanvasItemEditor : public VBoxContainer { CanvasItem *get_single_item(); int get_item_count(); - void _keying_changed(bool p_changed); + void _keying_changed(); void _unhandled_key_input(const InputEvent& p_ev); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 8903e12319..0fac1346fc 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -3504,13 +3504,7 @@ void SpatialEditor::_instance_scene() { undo_redo->commit_action(); #endif } -/* -void SpatialEditor::_update_selection() { - - -} -*/ void SpatialEditor::_unhandled_key_input(InputEvent p_event) { if (!is_visible()) @@ -3715,7 +3709,6 @@ void SpatialEditor::_bind_methods() { ObjectTypeDB::bind_method("_menu_item_pressed",&SpatialEditor::_menu_item_pressed); ObjectTypeDB::bind_method("_xform_dialog_action",&SpatialEditor::_xform_dialog_action); ObjectTypeDB::bind_method("_instance_scene",&SpatialEditor::_instance_scene); -// ObjectTypeDB::bind_method("_update_selection",&SpatialEditor::_update_selection); ObjectTypeDB::bind_method("_get_editor_data",&SpatialEditor::_get_editor_data); ObjectTypeDB::bind_method("_request_gizmo",&SpatialEditor::_request_gizmo); ObjectTypeDB::bind_method("_default_light_angle_input",&SpatialEditor::_default_light_angle_input); @@ -3817,7 +3810,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { editor=p_editor; editor_selection=editor->get_editor_selection(); editor_selection->add_editor_plugin(this); - editor_selection->connect("selection_changed",this,"_update_selection"); snap_enabled=false; tool_mode = TOOL_MODE_SELECT; diff --git a/tools/editor/plugins/spatial_editor_plugin.h b/tools/editor/plugins/spatial_editor_plugin.h index e8856d5a8f..b0e366b140 100644 --- a/tools/editor/plugins/spatial_editor_plugin.h +++ b/tools/editor/plugins/spatial_editor_plugin.h @@ -137,7 +137,6 @@ private: Vector3 _get_screen_to_space(const Vector3& p_vector3); void _select_region(); - void _update_selection(); bool _gizmo_select(const Vector2& p_screenpos,bool p_hilite_only=false); float get_znear() const; |