summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreduz <juan@okamstudio.com>2015-09-15 22:18:41 -0300
committerreduz <juan@okamstudio.com>2015-09-15 22:18:41 -0300
commita2f2d7610a7caaf1bb7d4f472b9a28a31316b01c (patch)
treeea2bfe4e94a835c9b99d24a1bc900cf9b4b1994d
parent2580ca01e6b73a54def5a8f6e61d19509d3278ee (diff)
parent1931d228fa6c825c2fff4becacb69c96292e841c (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
-rw-r--r--tools/editor/plugins/animation_player_editor_plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 344e42c13b..f8c484e886 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -1393,6 +1393,7 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) {
editor=p_node;
anim_editor = memnew( AnimationPlayerEditor(editor) );
+ anim_editor->set_undo_redo(editor->get_undo_redo());
editor->get_animation_panel()->add_child(anim_editor);
/*
editor->get_viewport()->add_child(anim_editor);