[Bf-blender-cvs] [c99f18a7871] blender2.8: Fix: Collada Importer: Keep bindinfo option is not properly handled
Gaia Clary
noreply at git.blender.org
Mon Nov 26 23:15:12 CET 2018
Commit: c99f18a7871f5bfe9454138d53aaccc575764d52
Author: Gaia Clary
Date: Mon Nov 26 23:11:29 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc99f18a7871f5bfe9454138d53aaccc575764d52
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.
===================================================================
M source/blender/collada/ArmatureImporter.cpp
===================================================================
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);
More information about the Bf-blender-cvs
mailing list