[Bf-blender-cvs] [7f57bc9] master: Avoid assert weight painting w/o an active group

Campbell Barton noreply at git.blender.org
Tue Nov 3 18:44:31 CET 2015


Commit: 7f57bc9ef4cc1e136d03e8167f413238c8c7cdca
Author: Campbell Barton
Date:   Wed Nov 4 04:37:47 2015 +1100
Branches: master
https://developer.blender.org/rB7f57bc9ef4cc1e136d03e8167f413238c8c7cdca

Avoid assert weight painting w/o an active group

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

M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/editors/sculpt_paint/paint_vertex.c

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 4cf9885..744a154 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1443,7 +1443,7 @@ static void calc_weightpaint_vert_array(
 	MDeformVert *dv = DM_get_vert_data_layer(dm, CD_MDEFORMVERT);
 	int numVerts = dm->getNumVerts(dm);
 
-	if (dv) {
+	if (dv && (ob->actdef != 0)) {
 		unsigned char (*wc)[4] = r_wtcol_v;
 		unsigned int i;
 
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 15627c6..5fa0c9f 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -985,7 +985,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	view3d_set_viewcontext(C, &vc);
 	me = BKE_mesh_from_object(vc.obact);
 
-	if (me && me->dvert && vc.v3d && vc.rv3d) {
+	if (me && me->dvert && vc.v3d && vc.rv3d && (vc.obact->actdef != 0)) {
 		const bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
 		int v_idx_best = -1;
 		unsigned int index;




More information about the Bf-blender-cvs mailing list