Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-04-06 13:42:38 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-04-06 13:42:38 +0300
commitfe73c1299018991397fac3cf4df570f2eebf5ab3 (patch)
tree3ddfca3337883dd263010c1d027b0463c6905f22 /source/blender/collada/DocumentImporter.cpp
parent4de70da73a1018469860a3b9595525f9eec7b025 (diff)
Fix Collada: Import of animations for objects with multiple materials
When importing multiple materials for one object, the imported material animation curves have all been assigned to the first material in the object. This fix also improves the console logging whenever the importer finds a consistency problem with the imported animation data.
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
-rw-r--r--source/blender/collada/DocumentImporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 08ac6e65c11..ce0d296843b 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -320,7 +320,7 @@ void DocumentImporter::translate_anim_recursive(COLLADAFW::Node *node, COLLADAFW
translate_anim_recursive(node, node, parob);
}
else {
- anim_importer.translate_Animations(node, root_map, object_map, FW_object_map);
+ anim_importer.translate_Animations(node, root_map, object_map, FW_object_map, uid_material_map);
COLLADAFW::NodePointerArray &children = node->getChildNodes();
for (i = 0; i < children.getCount(); i++) {
translate_anim_recursive(children[i], node, NULL);