Commit: 527733321c559de60509c7e88b5014d6e496b08d
Author: Antony Riakiotakis
Date: Fri Mar 7 15:58:08 2014 +0200
https://developer.blender.org/rB527733321c559de60509c7e88b5014d6e496b08d
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 5d4037a..bc4b537 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2195,7 +2195,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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
