diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-06 13:42:38 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-06 13:42:38 +0300 |
commit | fe73c1299018991397fac3cf4df570f2eebf5ab3 (patch) | |
tree | 3ddfca3337883dd263010c1d027b0463c6905f22 /source/blender/collada/AnimationImporter.h | |
parent | 4de70da73a1018469860a3b9595525f9eec7b025 (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/AnimationImporter.h')
-rw-r--r-- | source/blender/collada/AnimationImporter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 1f2de2f3162..e25116cac9f 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -156,7 +156,8 @@ public: void translate_Animations(COLLADAFW::Node * Node, std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map, std::multimap<COLLADAFW::UniqueId, Object*>& object_map, - std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map); + std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map, + std::map<COLLADAFW::UniqueId, Material*> uid_material_map); AnimMix* get_animation_type( const COLLADAFW::Node * node, std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map ); |