[Bf-blender-cvs] [300abf241e9] blender-v2.79-release: Fix T52639: Weight paint smooth tool crash

Campbell Barton noreply at git.blender.org
Fri Sep 8 12:08:22 CEST 2017


Commit: 300abf241e94a56da4994dfcdb23f6906ec8b402
Author: Campbell Barton
Date:   Thu Sep 7 13:20:39 2017 +1000
Branches: blender-v2.79-release
https://developer.blender.org/rB300abf241e94a56da4994dfcdb23f6906ec8b402

Fix T52639: Weight paint smooth tool crash

===================================================================

M	source/blender/editors/object/object_vgroup.c

===================================================================

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 3c406764157..1733cc28fa3 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1795,10 +1795,11 @@ static void vgroup_smooth_subset(
 	}
 	else {
 		for (int i = 0; i < dvert_tot; i++) {
-			MVert *v = &me->mvert[i];
+			const MVert *v = &me->mvert[i];
 			if (v->flag & SELECT) {
 				for (int j = 0; j < emap[i].count; j++) {
-					MVert *v_other = &me->mvert[emap[i].indices[j]];
+					const MEdge *e = &me->medge[emap[i].indices[j]];
+					const MVert *v_other = &me->mvert[(e->v1 == i) ? e->v2 : e->v1];
 					if ((source == WEIGHT_SMOOTH_ALL) ||
 					    (source == ((v_other->flag & SELECT) != 0)))
 					{



More information about the Bf-blender-cvs mailing list