Browse Source

Merge pull request #32350 from nekomatata/fix-bezier-curve-deselection-error

Fixed missing argument for clear_selection signal in Bezier Curve editor
Rémi Verschelde 6 years ago
parent
commit
a9e15a5c88
2 changed files with 1 additions and 3 deletions
  1. 1 1
      editor/animation_bezier_editor.cpp
  2. 0 2
      editor/animation_track_editor.cpp

+ 1 - 1
editor/animation_bezier_editor.cpp

@@ -546,7 +546,7 @@ void AnimationBezierTrackEdit::set_timeline(AnimationTimelineEdit *p_timeline) {
 }
 }
 void AnimationBezierTrackEdit::set_editor(AnimationTrackEditor *p_editor) {
 void AnimationBezierTrackEdit::set_editor(AnimationTrackEditor *p_editor) {
 	editor = p_editor;
 	editor = p_editor;
-	connect("clear_selection", editor, "_clear_selection");
+	connect("clear_selection", editor, "_clear_selection", varray(false));
 }
 }
 
 
 void AnimationBezierTrackEdit::_play_position_draw() {
 void AnimationBezierTrackEdit::_play_position_draw() {

+ 0 - 2
editor/animation_track_editor.cpp

@@ -3080,7 +3080,6 @@ void AnimationTrackEdit::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("insert_key", PropertyInfo(Variant::REAL, "ofs")));
 	ADD_SIGNAL(MethodInfo("insert_key", PropertyInfo(Variant::REAL, "ofs")));
 	ADD_SIGNAL(MethodInfo("select_key", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::BOOL, "single")));
 	ADD_SIGNAL(MethodInfo("select_key", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::BOOL, "single")));
 	ADD_SIGNAL(MethodInfo("deselect_key", PropertyInfo(Variant::INT, "index")));
 	ADD_SIGNAL(MethodInfo("deselect_key", PropertyInfo(Variant::INT, "index")));
-	ADD_SIGNAL(MethodInfo("clear_selection"));
 	ADD_SIGNAL(MethodInfo("bezier_edit"));
 	ADD_SIGNAL(MethodInfo("bezier_edit"));
 
 
 	ADD_SIGNAL(MethodInfo("move_selection_begin"));
 	ADD_SIGNAL(MethodInfo("move_selection_begin"));
@@ -4265,7 +4264,6 @@ void AnimationTrackEditor::_update_tracks() {
 		track_edit->connect("select_key", this, "_key_selected", varray(i), CONNECT_DEFERRED);
 		track_edit->connect("select_key", this, "_key_selected", varray(i), CONNECT_DEFERRED);
 		track_edit->connect("deselect_key", this, "_key_deselected", varray(i), CONNECT_DEFERRED);
 		track_edit->connect("deselect_key", this, "_key_deselected", varray(i), CONNECT_DEFERRED);
 		track_edit->connect("bezier_edit", this, "_bezier_edit", varray(i), CONNECT_DEFERRED);
 		track_edit->connect("bezier_edit", this, "_bezier_edit", varray(i), CONNECT_DEFERRED);
-		track_edit->connect("clear_selection", this, "_clear_selection");
 		track_edit->connect("move_selection_begin", this, "_move_selection_begin");
 		track_edit->connect("move_selection_begin", this, "_move_selection_begin");
 		track_edit->connect("move_selection", this, "_move_selection");
 		track_edit->connect("move_selection", this, "_move_selection");
 		track_edit->connect("move_selection_commit", this, "_move_selection_commit");
 		track_edit->connect("move_selection_commit", this, "_move_selection_commit");