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:
authorCampbell Barton <ideasman42@gmail.com>2021-11-03 14:26:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-11-03 14:26:39 +0300
commit3532da44ee2f2d1e1e169da3eacd081a3ce67308 (patch)
treee1940ac79aae5a8243ed2dac669254268abd4d43 /source/blender
parent5095e4fc22cedd9289e403d841e9561bc99236ab (diff)
parent42d0107ee5802d3e473c7af8880021078e6d13e3 (diff)
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/bmesh/operators/bmo_dissolve.c4
1 files changed, 2 insertions, 2 deletions
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);
}
}
}