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/DocumentImporter.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/DocumentImporter.h')
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 606218b644d..13f23b23388 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -151,7 +151,7 @@ private: std::map<COLLADAFW::UniqueId, Camera*> uid_camera_map; std::map<COLLADAFW::UniqueId, Lamp*> uid_lamp_map; std::map<Material*, TexIndexTextureArrayMap> material_texture_mapping_map; - std::map<COLLADAFW::UniqueId, Object*> object_map; + std::multimap<COLLADAFW::UniqueId, Object*> object_map; std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> node_map; std::vector<const COLLADAFW::VisualScene*> vscenes; std::vector<Object*> libnode_ob; |