[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56394] trunk/blender/source/blender/ collada/DocumentImporter.cpp: Fix collada module build for visual studio 2012.

[Brecht Van Lommel]

Revision: 56394
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56394
Author:   blendix
Date:     2013-04-29 19:15:53 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Fix collada module build for visual studio 2012.

Patch #35153 by Jurgen Herrmann.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-04-29 18:22:22 UTC (rev 56393)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-04-29 19:15:53 UTC (rev 56394)
@@ -477,7 +477,7 @@
 			// 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 @@
 			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)