[Bf-blender-cvs] [20276191e56] master: Cleanup: fix warning in recent parenthesis removal
Campbell Barton
noreply at git.blender.org
Mon Sep 26 03:43:51 CEST 2022
Commit: 20276191e567539ab25b87eb8da5fc079c73f218
Author: Campbell Barton
Date: Mon Sep 26 11:39:24 2022 +1000
Branches: master
https://developer.blender.org/rB20276191e567539ab25b87eb8da5fc079c73f218
Cleanup: fix warning in recent parenthesis removal
Regression in [0], this slipped through due to "-fpermissive"
being added to GCC flags, suppressing the error.
[0]: c9e35c2ced92082c86f1ecb9ecd16c6230218c7c
===================================================================
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