diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
commit | ddae05cdca9211a789a6501c6ca054f9a46e07c5 (patch) | |
tree | e7591dd7c31ccfb6c25beb0bca7bf670a788cd35 /source/blender/collada/ArmatureImporter.cpp | |
parent | 7ecc7c46af493f984e9cb2f08ac75da5b30ffd35 (diff) | |
parent | 2c9c22df26dfdcf03bb308fdf35294ed79c2d0e5 (diff) |
Merge remote-tracking branch 'origin' into blender2.8
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 8832e0fd577..b2794b3bd23 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -284,12 +284,11 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone BoneExtensionMap &extended_bones = bone_extension_manager.getExtensionMap(armature); BoneExtended *dominant_child = NULL; int maxlen = 0; - Bone *child; if (parentbone == NULL) return; - child = (Bone *)parentbone->childbase.first; + Bone *child = (Bone *)parentbone->childbase.first; if (child && (import_settings->find_chains || child->next==NULL)) { for (; child; child = child->next) { BoneExtended *be = extended_bones[child->name]; @@ -339,8 +338,8 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone } } } - for (Bone *child = (Bone *)parentbone->childbase.first; child; child = child->next) { - ArmatureImporter::connect_bone_chains(armature, child, UNLIMITED_CHAIN_MAX); + for (Bone *ch = (Bone *)parentbone->childbase.first; ch; ch = ch->next) { + ArmatureImporter::connect_bone_chains(armature, ch, UNLIMITED_CHAIN_MAX); } } else if (maxlen>1 && maxlen > this->import_settings->min_chain_length) { @@ -350,8 +349,8 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone else { /* can't connect this Bone. Proceed with children ... */ if (pbe) pbe->set_leaf_bone(true); - for (Bone *child = (Bone *)parentbone->childbase.first; child; child = child->next) { - ArmatureImporter::connect_bone_chains(armature, child, UNLIMITED_CHAIN_MAX); + for (Bone *ch = (Bone *)parentbone->childbase.first; ch; ch = ch->next) { + ArmatureImporter::connect_bone_chains(armature, ch, UNLIMITED_CHAIN_MAX); } } |