asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3289 from TheHX/pr-warnings

Browse source 
Fix some error messages
This commit is contained in:
Rémi Verschelde 2016-01-09 12:50:20 +01:00
commit dbdce7d6f5
6 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/editor/animation_editor.cpp
View file

@ -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");
}

1
tools/editor/editor_node.cpp
View file

@ -3831,7 +3831,6 @@ void EditorNode::animation_editor_make_visible(bool p_visible) {
}
animation_editor->set_keying(p_visible);
_update_keying();
}

4
tools/editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -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();

2
tools/editor/plugins/canvas_item_editor_plugin.h
View file

@ -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);

8
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -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;

1
tools/editor/plugins/spatial_editor_plugin.h
View file

@ -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;