summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Hallenius <redsymbzone@hotmail.com>2014-08-15 03:35:31 +0200
committerTheo Hallenius <redsymbzone@hotmail.com>2014-08-15 03:35:31 +0200
commit0dd29d0512a4e28f83f7b4529fccf9f126982a5d (patch)
treedc9b825acc1ad1b5b8e86b7ed4b4ac9e35ae9fca
parent85bccf487cbc3d40b16d4cb23efa43fd75d6499f (diff)
Forgot about keeping value tracks.
-rw-r--r--tools/editor/io_plugins/editor_scene_import_plugin.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index a3c2436328..99a2326b4b 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -1571,14 +1571,13 @@ void EditorSceneImportPlugin::_merge_existing_node(Node *p_node,Node *p_imported
}
}
- // Append function callbacks
+ // Append function callbacks and values
for (int x = 0; x < found->get_track_count(); x++) {
- if (found->track_get_type(x) == Animation::TYPE_METHOD)
- candidate->add_track(Animation::TYPE_METHOD, candidate->get_track_count());
+ if (found->track_get_type(x) == Animation::TYPE_METHOD || found->track_get_type(x) == Animation::TYPE_VALUE)
+ candidate->add_track(found->track_get_type(x), candidate->get_track_count());
- for (int k = 0; k < found->track_get_key_count(x); k++) {
+ for (int k = 0; k < found->track_get_key_count(x); k++)
candidate->track_insert_key(x, found->track_get_key_time(x, k), found->track_get_key_value(x, k), found->track_get_key_transition(x, k));
- }
}
}