Revision: 30785
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30785
Author: nicholasbishop
Date: 2010-07-27 02:09:25 +0200 (Tue, 27 Jul 2010)
Log Message:
-----------
== Sculpt ==
* Added back mask brush, accidentally removed during last merge
* Removed an incorrect assert in paint mask
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
Modified:
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
---
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_mask.c
2010-07-27 00:08:15 UTC (rev 30784)
+++
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_mask.c
2010-07-27 00:09:25 UTC (rev 30785)
@@ -418,7 +418,8 @@
float *griddata;
int i;
- assert(cdm && layer_name);
+ if(!cdm)
+ return;
for(i = 0; i < me->totface; ++i) {
switch(op) {
Modified:
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
2010-07-27 00:08:15 UTC (rev 30784)
+++ branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
2010-07-27 00:09:25 UTC (rev 30785)
@@ -54,7 +54,7 @@
{SCULPT_TOOL_GRAB, "GRAB", ICON_BRUSH_GRAB, "Grab", ""},
{SCULPT_TOOL_INFLATE, "INFLATE", ICON_BRUSH_INFLATE, "Inflate", ""},
{SCULPT_TOOL_LAYER, "LAYER", ICON_BRUSH_LAYER, "Layer", ""},
- //{SCULPT_TOOL_MASK, "MASK", 0, "Mask", ""},
+ {SCULPT_TOOL_MASK, "MASK", 0, "Mask", ""},
{SCULPT_TOOL_NUDGE, "NUDGE", ICON_BRUSH_NUDGE, "Nudge", ""},
{SCULPT_TOOL_PINCH, "PINCH", ICON_BRUSH_PINCH, "Pinch", ""},
{SCULPT_TOOL_ROTATE, "ROTATE", ICON_BRUSH_ROTATE, "Rotate", ""},
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
