From 4b891b40c218ef5f45706cbc4636a5333469dd1c Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Fri, 23 Sep 2016 12:56:04 +0200 Subject: Fix: Collada Importer did not import the Blender Profile information correctly when multiple objects are bound to same armature. This caused Bone tails to be placed wrong. --- source/blender/collada/collada_utils.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'source/blender/collada/collada_utils.h') diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index ee371f7959e..7fdbef3b6cb 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -153,5 +153,24 @@ public: int get_use_connect(); }; +/* a map to store bone extension maps +| std:string : an armature name +| BoneExtended * : a map that contains extra data for bones +*/ +typedef std::map BoneExtensionMap; + +/* +| A class to organise bone extendion data for multiple Armatures. +| this is needed for the case where a Collada file contains 2 or more +| separate armatures. +*/ +class BoneExtensionManager { +private: + std::map extended_bone_maps; + +public: + BoneExtensionMap &getExtensionMap(bArmature *armature); + ~BoneExtensionManager(); +}; #endif -- cgit v1.2.3