[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22530] branches/blender2.5/blender: 2. 5 Sculpt:

Nicholas Bishop nicholasbishop at gmail.com
Sun Aug 16 21:50:00 CEST 2009


Revision: 22530
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22530
Author:   nicholasbishop
Date:     2009-08-16 21:50:00 +0200 (Sun, 16 Aug 2009)

Log Message:
-----------
2.5 Sculpt:

* Added a new Paint type in scene DNA. This is now the base struct for Sculpt.
* The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots.
* Modified the UI for the new Paint type, now shows the list of brushes active for this mode
* Added a New Brush operator, shows in the UI as a list of brush tool types to add
* Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types

TODO:
* Vertex paint, weight paint, texture paint need to be converted to this system next
* Add brush presets to the default blend

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
    branches/blender2.5/blender/source/blender/blenkernel/BKE_brush.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_utils.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
    branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sculpt_paint.c

Modified: branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-08-16 19:50:00 UTC (rev 22530)
@@ -292,10 +292,22 @@
 		
 		settings = self.paint_settings(context)
 		brush = settings.brush
-		
+
 		if not context.particle_edit_object:
-			layout.split().row().template_ID(settings, "brush")
-		
+			col = layout.split().column()
+			if context.sculpt_object:
+				row = col.row()
+				row.template_list(settings, "brushes", settings, "active_brush_index", rows=2)
+				
+				sub_col = row.column(align=True)
+				sub_col.itemO("paint.brush_slot_add", icon="ICON_ZOOMIN", text="")
+				sub_col.itemO("paint.brush_slot_remove", icon="ICON_ZOOMOUT", text="")
+
+		col.template_ID(settings, "brush")
+
+		if(context.sculpt_object):
+			col.item_menu_enumO("brush.new", "sculpt_tool");
+                
 		# Particle Mode #
 
 		# XXX This needs a check if psys is editable.
@@ -323,9 +335,7 @@
 
 		# Sculpt Mode #
 		
-		elif context.sculpt_object:
-			layout.column().itemR(brush, "sculpt_tool", expand=True)
-				
+		elif context.sculpt_object and settings.brush:
 			col = layout.column()
 				
 			row = col.row(align=True)
@@ -348,6 +358,8 @@
 				if brush.sculpt_tool == 'LAYER':
 					col.itemR(brush, "persistent")
 					col.itemO("sculpt.set_persistent_base")
+
+			col.itemR(brush, "sculpt_tool")
 				
 		# Texture Paint Mode #
 		

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_brush.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_brush.h	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_brush.h	2009-08-16 19:50:00 UTC (rev 22530)
@@ -38,13 +38,12 @@
 struct wmOperator;
 
 /* datablock functions */
-struct Brush *add_brush(char *name);
+struct Brush *add_brush(const char *name);
 struct Brush *copy_brush(struct Brush *brush);
 void make_local_brush(struct Brush *brush);
 void free_brush(struct Brush *brush);
 
 /* brush library operations used by different paint panels */
-struct Brush **current_brush_source(struct Scene *sce);
 int brush_set_nr(struct Brush **current_brush, int nr);
 int brush_delete(struct Brush **current_brush);
 void brush_check_exists(struct Brush **brush);

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h	2009-08-16 19:50:00 UTC (rev 22530)
@@ -28,8 +28,20 @@
 #ifndef BKE_PAINT_H
 #define BKE_PAINT_H
 
+struct Brush;
 struct Object;
+struct Paint;
+struct Scene;
 
+void free_paint(Paint *p);
+void copy_paint(Paint *orig, Paint *new);
+
+struct Paint *paint_get_active(struct Scene *sce);
+struct Brush *paint_brush(struct Paint *paint);
+void paint_brush_set(struct Paint *paint, struct Brush *br);
+void paint_brush_slot_add(struct Paint *p);
+void paint_brush_slot_remove(struct Paint *p);
+
 /* testing face select mode
  * Texture paint could be removed since selected faces are not used
  * however hiding faces is useful */

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c	2009-08-16 19:50:00 UTC (rev 22530)
@@ -62,7 +62,7 @@
 
 /* Datablock add/copy/free/make_local */
 
-Brush *add_brush(char *name)
+Brush *add_brush(const char *name)
 {
 	Brush *brush;
 
@@ -186,23 +186,6 @@
 
 /* Library Operations */
 
-Brush **current_brush_source(Scene *sce)
-{
-	Object *ob = sce->basact ? sce->basact->object : NULL;
-
-	if(ob) {
-		if(ob->mode & OB_MODE_SCULPT)
-			return &sce->toolsettings->sculpt->brush;
-		else if(ob->mode & OB_MODE_VERTEX_PAINT)
-			return &sce->toolsettings->vpaint->brush;
-		else if(ob->mode & OB_MODE_WEIGHT_PAINT)
-			return &sce->toolsettings->wpaint->brush;
-		else if(ob->mode & OB_MODE_TEXTURE_PAINT)
-			return &sce->toolsettings->imapaint.brush;
-	}
-	return NULL;
-}
-
 int brush_set_nr(Brush **current_brush, int nr)
 {
 	ID *idtest, *id;

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-16 19:50:00 UTC (rev 22530)
@@ -25,13 +25,126 @@
  * ***** END GPL LICENSE BLOCK *****
  */ 
 
+#include "MEM_guardedalloc.h"
+
+#include "DNA_brush_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
+#include "BKE_brush.h"
 #include "BKE_global.h"
 #include "BKE_paint.h"
 
+#include <stdlib.h>
+#include <string.h>
+
+Paint *paint_get_active(Scene *sce)
+{
+	if(sce && sce->basact && sce->basact->object) {
+		switch(sce->basact->object->mode) {
+		case OB_MODE_SCULPT:
+			return &sce->toolsettings->sculpt->paint;
+		}
+	}
+	/*else if(G.f & G_VERTEXPAINT)
+		return &sce->toolsettings->vpaint->paint;
+	else if(G.f & G_WEIGHTPAINT)
+		return &sce->toolsettings->wpaint->paint;
+	else if(G.f & G_TEXTUREPAINT)
+	return &sce->toolsettings->imapaint.paint;*/
+
+	return NULL;
+}
+
+Brush *paint_brush(Paint *p)
+{
+	return p && p->brushes ? p->brushes[p->active_brush_index] : NULL;
+}
+
+void paint_brush_set(Paint *p, Brush *br)
+{
+	if(p && p->brushes) {
+		int i;
+
+		/* See if there's already a slot with the brush */
+		for(i = 0; i < p->brush_count; ++i) {
+			if(p->brushes[i] == br) {
+				p->active_brush_index = i;
+				break;
+			}
+		}
+		
+	}
+	else
+		paint_brush_slot_add(p);
+
+	/* Make sure the current slot is the new brush */
+	p->brushes[p->active_brush_index] = br;
+}
+
+static void paint_brush_slots_alloc(Paint *p, const int count)
+{
+	p->brush_count = count;
+	if(count == 0)
+		p->brushes = NULL;
+	else
+		p->brushes = MEM_callocN(sizeof(Brush*) * count, "Brush slots");
+}
+
+void paint_brush_slot_add(Paint *p)
+{
+	Brush **orig = p->brushes;
+	int orig_count = p->brushes ? p->brush_count : 0;
+
+	/* Increase size of brush slot array */
+	paint_brush_slots_alloc(p, orig_count + 1);
+	if(orig) {
+		memcpy(p->brushes, orig, sizeof(Brush*) * orig_count);
+		MEM_freeN(orig);
+	}
+
+	p->active_brush_index = orig_count;
+}
+
+void paint_brush_slot_remove(Paint *p)
+{
+	if(p->brushes) {
+		Brush **orig = p->brushes;
+		int src, dst;
+		
+		/* Decrease size of brush slot array */
+		paint_brush_slots_alloc(p, p->brush_count - 1);
+		if(p->brushes) {
+			for(src = 0, dst = 0; dst < p->brush_count; ++src) {
+				if(src != p->active_brush_index) {
+					p->brushes[dst] = orig[src];
+					++dst;
+				}
+			}
+		}
+		MEM_freeN(orig);
+
+		if(p->active_brush_index >= p->brush_count)
+			p->active_brush_index = p->brush_count - 1;
+		if(p->active_brush_index < 0)
+			p->active_brush_index = 0;
+	}
+}
+
 int paint_facesel_test(Object *ob)
 {
 	return (G.f&G_FACESELECT) && (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)));
 
 }
+
+void free_paint(Paint *paint)
+{
+	if(paint->brushes)
+		MEM_freeN(paint->brushes);
+}
+
+void copy_paint(Paint *orig, Paint *new)
+{
+	if(orig->brushes)
+		new->brushes = MEM_dupallocN(orig->brushes);
+}

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c	2009-08-16 19:50:00 UTC (rev 22530)
@@ -76,6 +76,7 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_scene.h"
 #include "BKE_sequence.h"
 #include "BKE_world.h"
@@ -173,7 +174,7 @@
 			}
 			if(ts->sculpt) {
 				ts->sculpt= MEM_dupallocN(ts->sculpt);
-				id_us_plus((ID *)ts->sculpt->brush);
+				copy_paint(&ts->sculpt->paint, &ts->sculpt->paint);
 			}
 
 			id_us_plus((ID *)ts->imapaint.brush);
@@ -275,8 +276,10 @@
 			MEM_freeN(sce->toolsettings->vpaint);
 		if(sce->toolsettings->wpaint)
 			MEM_freeN(sce->toolsettings->wpaint);
-		if(sce->toolsettings->sculpt)
+		if(sce->toolsettings->sculpt) {
+			free_paint(&sce->toolsettings->sculpt->paint);
 			MEM_freeN(sce->toolsettings->sculpt);
+		}
 		
 		MEM_freeN(sce->toolsettings);
 		sce->toolsettings = NULL;	

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-16 18:25:22 UTC (rev 22529)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-16 19:50:00 UTC (rev 22530)
@@ -4036,9 +4036,12 @@
 			
 			sce->toolsettings->imapaint.brush=
 				newlibadr_us(fd, sce->id.lib, sce->toolsettings->imapaint.brush);
-			if(sce->toolsettings->sculpt)
-				sce->toolsettings->sculpt->brush=
-					newlibadr_us(fd, sce->id.lib, sce->toolsettings->sculpt->brush);
+			if(sce->toolsettings->sculpt && sce->toolsettings->sculpt->paint.brushes) {
+				int i;
+				for(i = 0; i < sce->toolsettings->sculpt->paint.brush_count; ++i)
+					sce->toolsettings->sculpt->paint.brushes[i]=
+						newlibadr_us(fd, sce->id.lib, sce->toolsettings->sculpt->paint.brushes[i]);
+			}
 			if(sce->toolsettings->vpaint)
 				sce->toolsettings->vpaint->brush=
 					newlibadr_us(fd, sce->id.lib, sce->toolsettings->vpaint->brush);
@@ -4148,6 +4151,8 @@
 		sce->toolsettings->vpaint= newdataadr(fd, sce->toolsettings->vpaint);
 		sce->toolsettings->wpaint= newdataadr(fd, sce->toolsettings->wpaint);
 		sce->toolsettings->sculpt= newdataadr(fd, sce->toolsettings->sculpt);
+		if(sce->toolsettings->sculpt)
+			sce->toolsettings->sculpt->paint.brushes= newdataadr(fd, sce->toolsettings->sculpt->paint.brushes);
 		sce->toolsettings->imapaint.paintcursor= NULL;
 		sce->toolsettings->particle.paintcursor= NULL;
 	}


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list