[Bf-blender-cvs] [03eac69c619] master: Cleanup: restore parenthesis removed in recent commit
Campbell Barton
noreply at git.blender.org
Mon Sep 26 13:53:01 CEST 2022
Commit: 03eac69c619e6e7949fe8d3961d15afda8059989
Author: Campbell Barton
Date: Mon Sep 26 21:49:31 2022 +1000
Branches: master
https://developer.blender.org/rB03eac69c619e6e7949fe8d3961d15afda8059989
Cleanup: restore parenthesis removed in recent commit
Partial revert [0], removed by accident because the -fpermissive
flag was enabled with collada.
[0]: 34477bbfcde34d0b27f04eccdddd0a093d8be1c0
===================================================================
M source/blender/io/collada/ArmatureImporter.cpp
===================================================================
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp
index a742ee3a1dd..1310337f501 100644
--- a/source/blender/io/collada/ArmatureImporter.cpp
+++ b/source/blender/io/collada/ArmatureImporter.cpp
@@ -1022,7 +1022,7 @@ bool ArmatureImporter::get_joint_bind_mat(float m[4][4], COLLADAFW::Node *joint)
bool found = false;
for (it = skin_by_data_uid.begin(); it != skin_by_data_uid.end(); it++) {
SkinInfo &skin = it->second;
- if (found = skin.get_joint_inv_bind_matrix(m, joint)) {
+ if ((found = skin.get_joint_inv_bind_matrix(m, joint))) {
invert_m4(m);
break;
}
More information about the Bf-blender-cvs
mailing list