[Bf-blender-cvs] [dc0bf9b7027] master: Fix T94453: Weld modifier crash after recent cleanup
Hans Goudey
noreply at git.blender.org
Wed Dec 29 07:17:02 CET 2021
Commit: dc0bf9b7027783c3a760cc08286213c59db936f0
Author: Hans Goudey
Date: Wed Dec 29 00:16:54 2021 -0600
Branches: master
https://developer.blender.org/rBdc0bf9b7027783c3a760cc08286213c59db936f0
Fix T94453: Weld modifier crash after recent cleanup
I had assumed that the span's size was the same as the length variable.
In the future, separate lengths could be removed in favor of using
lengths directly from spans.
===================================================================
M source/blender/modifiers/intern/MOD_weld.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc
index 097ed26afb3..1f7783f8b28 100644
--- a/source/blender/modifiers/intern/MOD_weld.cc
+++ b/source/blender/modifiers/intern/MOD_weld.cc
@@ -1040,9 +1040,9 @@ static void weld_poly_loop_ctx_setup(Span<MLoop> mloop,
if (remain_edge_ctx_len) {
- /* Setup Poly/Loop. */
-
- for (WeldPoly &wp : wpoly) {
+ /* Setup Poly/Loop. Note that `wpoly_len` may be different than `wpoly.size()` here. */
+ for (const int i : IndexRange(wpoly_len)) {
+ WeldPoly &wp = wpoly[i];
const int ctx_loops_len = wp.loops.len;
const int ctx_loops_ofs = wp.loops.ofs;
More information about the Bf-blender-cvs
mailing list