Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-11-27 01:11:29 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-11-27 01:14:46 +0300
commitc99f18a7871f5bfe9454138d53aaccc575764d52 (patch)
tree1e8214cb01d7dfb67380d17bfe89c4acebf5b558 /source/blender/collada
parent65874d3f33c5bbc2d91b3239ca549a635a12ba29 (diff)
Fix: Collada Importer: Keep bindinfo option is not properly handled
Actually the option was not at all used and the importer always created the bindinfo custom properties.
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/ArmatureImporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 32c7363a994..2644eef5e4a 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -172,7 +172,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon
}
copy_v3_v3(bone->head, mat[3]);
- if (bone_is_skinned)
+ if (bone_is_skinned && this->import_settings->keep_bind_info)
{
float rest_mat[4][4];
get_node_mat(rest_mat, node, NULL, NULL, NULL);