diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2012-05-01 03:51:09 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2012-05-01 03:51:09 +0400 |
| commit | 7cb037db8628c0522fb8c143d461e2054b616771 (patch) | |
| tree | bfc50dcba09730153f5b167f60e3b6ba4a087c07 /source/blender/collada/AnimationImporter.h | |
| parent | 5369a867a32e74bd481d288b9ddb5f2440da2a9f (diff) | |
Apply patch [#31179] COLLADA IMPORT instanced geometry improvement
from Martijn Berger
This patch improves importing instanced geometry consisting of multiple nodes.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 953c454c73c..492d63dbe8e 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -143,10 +143,10 @@ public: virtual void change_eul_to_quat(Object *ob, bAction *act); #endif - void translate_Animations(COLLADAFW::Node * Node, - std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map, - std::map<COLLADAFW::UniqueId, Object*>& object_map, - std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map); + 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); AnimMix* get_animation_type( const COLLADAFW::Node * node, std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map ); |