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/collada_utils.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/collada_utils.h')
| -rw-r--r-- | source/blender/collada/collada_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index e9f84afef61..c821a5dd267 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -136,7 +136,7 @@ public: void set_leaf_bone(bool state); bool is_leaf_bone(); - void set_bone_layers(std::string layers); + void set_bone_layers(std::string layers, std::vector<std::string> &layer_labels); int get_bone_layers(); static std::string get_bone_layers(int bitfield); |