diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-23 17:19:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 17:19:20 +0200 |
| commit | f1e5a47fab3b6e305427deb9fac03e9295dd7b16 (patch) | |
| tree | 8a129577ec48578145fd640fadd9637cc0d6ee02 | |
| parent | 0980991e6433a3f394a9ae99bec10cb04c8b77e0 (diff) | |
| parent | 9d5e1228eaa1fe0180b23969edda80d3c461f677 (diff) | |
Merge pull request #19103 from volzhs/fix-reimport-dae
Fix updating mesh when reimporting
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 1d7545f182..2fb3bf7b1e 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -339,7 +339,7 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Spatial *p_parent) { NodeMap nm; nm.node = node; node_map[p_node->id] = nm; - node_name_map[p_node->name] = p_node->id; + node_name_map[node->get_name()] = p_node->id; Transform xf = p_node->default_transform; xf = collada.fix_transform(xf) * p_node->post_transform; |