From 7cb037db8628c0522fb8c143d461e2054b616771 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Mon, 30 Apr 2012 23:51:09 +0000
Subject: Apply patch [#31179] COLLADA IMPORT instanced geometry improvement
 from Martijn Berger

This patch improves importing instanced geometry consisting of multiple nodes.
---
 source/blender/collada/AnimationImporter.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/blender/collada/AnimationImporter.h')

diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h
index 953c454c73c..492d63dbe8e 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/collada/AnimationImporter.h
@@ -143,10 +143,10 @@ public:
 	virtual void change_eul_to_quat(Object *ob, bAction *act);
 #endif
 
-	void translate_Animations(COLLADAFW::Node * Node,
-	                          std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
-	                          std::map<COLLADAFW::UniqueId, Object*>& object_map,
-	                          std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map);
+	void translate_Animations(COLLADAFW::Node * Node , 
+							  std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
+							  std::multimap<COLLADAFW::UniqueId, Object*>& object_map ,
+							  std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map);
 
 	AnimMix* get_animation_type( const COLLADAFW::Node * node, std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map );
 
-- 
cgit v1.2.3