From cd60848dd01ba91bf9e51ce8f0488115db91ad35 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 29 Apr 2013 19:15:53 +0000 Subject: Fix collada module build for visual studio 2012. Patch #35153 by Jurgen Herrmann. --- source/blender/collada/DocumentImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/collada/DocumentImporter.cpp') 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 *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(node->getUniqueId(), par)); + object_map.insert(std::pair(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 *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(node->getUniqueId(), ob)); + object_map.insert(std::pair(node->getUniqueId(), ob)); node_map[node->getUniqueId()] = node; if (is_library_node) -- cgit v1.2.3