[Bf-blender-cvs] [20f7a34] master: Fix hard crash when using persistent base on layer brush on multires and dyntopo.

[Antony Riakiotakis]

Commit: 20f7a34abe871a6c3e4b168c6831bbaef55ce64f
Author: Antony Riakiotakis
Date:   Fri Mar 7 15:58:08 2014 +0200
https://developer.blender.org/rB20f7a34abe871a6c3e4b168c6831bbaef55ce64f

Fix hard crash when using persistent base on layer brush on multires and
dyntopo.

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

M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index df1b14a..7b10b82 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2202,7 +2202,7 @@ static void do_layer_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode
 
 				mul_v3_v3fl(val, offset, *disp);
 
-				if (ss->layer_co && (brush->flag & BRUSH_PERSISTENT)) {
+				if (!ss->multires && !ss->bm && ss->layer_co && (brush->flag & BRUSH_PERSISTENT)) {
 					int index = vd.vert_indices[vd.i];
 
 					/* persistent base */