diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-03 20:37:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-03 20:37:47 +0300 |
| commit | 7f57bc9ef4cc1e136d03e8167f413238c8c7cdca (patch) | |
| tree | 9342c8fa30e6b48b8280dfbbee233e5111acc436 /source/blender | |
| parent | 020fdeb760b1f2dda38cf9aa5e9652b86f7588c1 (diff) | |
Avoid assert weight painting w/o an active group
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 4cf9885c716..744a154ae78 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 15627c6ab42..5fa0c9fc71e 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; |