Index: source/blender/collada/DocumentImporter.cpp =================================================================== --- source/blender/collada/DocumentImporter.cpp (revision 56392) +++ source/blender/collada/DocumentImporter.cpp (working copy) @@ -477,7 +477,13 @@ // 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); +/* Ugly MSVC 2012 Workaround TODO: make this cleaner*/ +#if defined(_MSC_VER) && _MSC_VER >= 1700 + object_map.insert(std::pair(node->getUniqueId(), par)); +#else object_map.insert(std::make_pair(node->getUniqueId(), par)); +#endif +/* -.- */ node_map[node->getUniqueId()] = node; } armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce); @@ -582,7 +588,13 @@ ob = *it; std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId(); rename_id(&ob->id, (char *)nodename.c_str()); +/* Ugly MSVC 2012 Workaround TODO: make this cleaner*/ +#if defined(_MSC_VER) && _MSC_VER >= 1700 + object_map.insert(std::pair(node->getUniqueId(), ob)); +#else object_map.insert(std::make_pair(node->getUniqueId(), ob)); +#endif +/* -.- */ node_map[node->getUniqueId()] = node; if (is_library_node)