[Bf-blender-cvs] [42d0107ee58] blender-v3.0-release: Fix crash dissolving overlapping faces
Campbell Barton
noreply at git.blender.org
Wed Nov 3 12:22:18 CET 2021
Commit: 42d0107ee5802d3e473c7af8880021078e6d13e3
Author: Campbell Barton
Date: Wed Nov 3 22:12:42 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rB42d0107ee5802d3e473c7af8880021078e6d13e3
Fix crash dissolving overlapping faces
In rare cases disolving faces would crash, caused by iterator
variable reuse in b29a8a5dfe3d6eb2fbbdecd0d5dffb3d709b9b91.
===================================================================
M source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index efba0ec99ec..360dcc2c79e 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -233,8 +233,8 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
* This could optionally do a partial merge, where some faces are joined. */
/* Prevent these faces from being removed. */
- for (i = 0; i < faces_len; i++) {
- BMO_face_flag_disable(bm, faces[i], FACE_ORIG);
+ for (int j = 0; j < faces_len; j++) {
+ BMO_face_flag_disable(bm, faces[j], FACE_ORIG);
}
}
}
More information about the Bf-blender-cvs
mailing list