diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 01:35:50 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 01:37:46 +0300 |
| commit | 5366900acec5dccaafb1afe21a61679404ddcfff (patch) | |
| tree | b9b5e9ea302f3064f22b08e74231c6e0955cda30 /source/blender/collada/ArmatureImporter.h | |
| parent | 8b2c67c3c35793367cf421979a7b425b348d2802 (diff) | |
Added support for non numeric bone layer labels (could happen when importing from other tools)
Differential Revision: https://developer.blender.org/D2037
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index fba8c5bd5d6..f38bd1a6c66 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -106,9 +106,9 @@ private: #endif int create_bone(SkinInfo* skin, COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[4][4], bArmature *arm); + float parent_mat[4][4], bArmature *arm, std::vector<std::string> &layer_labels); - BoneExtended &add_bone_extended(EditBone *bone, COLLADAFW::Node * node); + BoneExtended &add_bone_extended(EditBone *bone, COLLADAFW::Node * node, std::vector<std::string> &layer_labels); void clear_extended_boneset(); void fix_leaf_bones(bArmature *armature, Bone *bone); |