[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53447] trunk/blender/source/blender: Add simplify brush for sculpt mode

[Nicholas Bishop]

Revision: 53447
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53447
Author:   nicholasbishop
Date:     2012-12-30 18:30:40 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Add simplify brush for sculpt mode

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/makesdna/DNA_brush_types.h
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-12-30 18:30:13 UTC (rev 53446)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-12-30 18:30:40 UTC (rev 53447)
@@ -2981,7 +2981,9 @@
 	if (totnode) {
 		PBVHTopologyUpdateMode mode = PBVH_Subdivide;
 
-		if (sd->flags & SCULPT_DYNTOPO_COLLAPSE) {
+		if ((sd->flags & SCULPT_DYNTOPO_COLLAPSE) ||
+			(brush->sculpt_tool == SCULPT_TOOL_SIMPLIFY))
+		{
 			mode |= PBVH_Collapse;
 		}
 
@@ -3539,6 +3541,8 @@
 			return "Rotate Brush";
 		case SCULPT_TOOL_MASK:
 			return "Mask Brush";
+		case SCULPT_TOOL_SIMPLIFY:
+			return "Simplify Brush";
 	}
 
 	return "Sculpting";
@@ -4262,7 +4266,8 @@
 		do_symmetrical_brush_actions(sd, ob, sculpt_topology_update);
 	}
 
-	do_symmetrical_brush_actions(sd, ob, do_brush_action);
+	if (paint_brush(&sd->paint)->sculpt_tool != SCULPT_TOOL_SIMPLIFY)
+		do_symmetrical_brush_actions(sd, ob, do_brush_action);
 
 	sculpt_combine_proxies(sd, ob);
 

Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h	2012-12-30 18:30:13 UTC (rev 53446)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h	2012-12-30 18:30:40 UTC (rev 53447)
@@ -156,10 +156,7 @@
 	SCULPT_TOOL_THUMB = 12,
 	SCULPT_TOOL_SNAKE_HOOK = 13,
 	SCULPT_TOOL_ROTATE = 14,
-	
-	/* slot 15 is free for use */
-	/* SCULPT_TOOL_ = 15, */
-	
+	SCULPT_TOOL_SIMPLIFY = 15,
 	SCULPT_TOOL_CREASE = 16,
 	SCULPT_TOOL_BLOB = 17,
 	SCULPT_TOOL_CLAY_STRIPS = 18,

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2012-12-30 18:30:13 UTC (rev 53446)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2012-12-30 18:30:40 UTC (rev 53447)
@@ -65,6 +65,7 @@
 	{SCULPT_TOOL_PINCH, "PINCH", ICON_BRUSH_PINCH, "Pinch", ""},
 	{SCULPT_TOOL_ROTATE, "ROTATE", ICON_BRUSH_ROTATE, "Rotate", ""},
 	{SCULPT_TOOL_SCRAPE, "SCRAPE", ICON_BRUSH_SCRAPE, "Scrape", ""},
+	{SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_SUBTRACT /* icon TODO */, "Simplify", ""},
 	{SCULPT_TOOL_SMOOTH, "SMOOTH", ICON_BRUSH_SMOOTH, "Smooth", ""},
 	{SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", ICON_BRUSH_SNAKE_HOOK, "Snake Hook", ""},
 	{SCULPT_TOOL_THUMB, "THUMB", ICON_BRUSH_THUMB, "Thumb", ""},