godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
reduz
2015-09-15 22:18:41 -03:00
parent 2580ca01e6 1931d228fa
commit a2f2d7610a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -1393,6 +1393,7 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) {
editor=p_node; editor=p_node;
anim_editor = memnew( AnimationPlayerEditor(editor) ); anim_editor = memnew( AnimationPlayerEditor(editor) );
anim_editor->set_undo_redo(editor->get_undo_redo());
editor->get_animation_panel()->add_child(anim_editor); editor->get_animation_panel()->add_child(anim_editor);
/* /*
editor->get_viewport()->add_child(anim_editor); editor->get_viewport()->add_child(anim_editor);