Merge pull request #52664 from butkeim/3.x

[3.x] Fix 3D Onion skinning missing
godotengine · Sep 14, 2021 · 07d7754 · 07d7754
2 parents 82ca712 + 77b00d1
commit 07d7754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
@@ -902,7 +902,7 @@ void AnimationPlayerEditor::edit(AnimationPlayer *p_player) {
 	}
 }
 
-void AnimationPlayerEditor::forward_canvas_force_draw_over_viewport(Control *p_overlay) {
+void AnimationPlayerEditor::forward_force_draw_over_viewport(Control *p_overlay) {
 	if (!onion.can_overlay) {
 		return;
 	}

diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
@@ -238,7 +238,7 @@ class AnimationPlayerEditor : public VBoxContainer {
 
 	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
 	void edit(AnimationPlayer *p_player);
-	void forward_canvas_force_draw_over_viewport(Control *p_overlay);
+	void forward_force_draw_over_viewport(Control *p_overlay);
 
 	AnimationPlayerEditor(EditorNode *p_editor, AnimationPlayerEditorPlugin *p_plugin);
 };
@@ -262,7 +262,8 @@ class AnimationPlayerEditorPlugin : public EditorPlugin {
 	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
-	virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay) { anim_editor->forward_canvas_force_draw_over_viewport(p_overlay); }
+	virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay) { anim_editor->forward_force_draw_over_viewport(p_overlay); }
+	virtual void forward_spatial_force_draw_over_viewport(Control *p_overlay) { anim_editor->forward_force_draw_over_viewport(p_overlay); }
 
 	AnimationPlayerEditorPlugin(EditorNode *p_node);
 	~AnimationPlayerEditorPlugin();
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
-    void AnimationPlayerEditor::forward_canvas_force_draw_over_viewport(Control *p_overlay) {
+    void AnimationPlayerEditor::forward_force_draw_over_viewport(Control *p_overlay) {
     	if (!onion.can_overlay) {
     		return;
     	}
@@ Expand Down @@