diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-29 23:15:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-29 23:15:53 +0400 |
| commit | cd60848dd01ba91bf9e51ce8f0488115db91ad35 (patch) | |
| tree | 71207e0f0b973d15ac963692c26ade7a398abafc /source/blender/collada/DocumentImporter.cpp | |
| parent | b0b634adeb3158877466554c9d766148a149e27f (diff) | |
Fix collada module build for visual studio 2012.
Patch #35153 by Jurgen Herrmann.
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 49db6f033d9..41bd561f86d 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -477,7 +477,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA // Here we add the armature "on the fly": par = bc_add_object(sce, OB_ARMATURE, std::string("Armature").c_str()); objects_done->push_back(par); - object_map.insert(std::make_pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), par)); + object_map.insert(std::pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), par)); node_map[node->getUniqueId()] = node; } armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce); @@ -582,7 +582,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA ob = *it; std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId(); rename_id(&ob->id, (char *)nodename.c_str()); - object_map.insert(std::make_pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), ob)); + object_map.insert(std::pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), ob)); node_map[node->getUniqueId()] = node; if (is_library_node) |