[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22658] branches/blender2.5/blender/source /blender: 2.5 Paint:

Nicholas Bishop nicholasbishop at gmail.com
Thu Aug 20 18:00:17 CEST 2009


Revision: 22658
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22658
Author:   nicholasbishop
Date:     2009-08-20 18:00:17 +0200 (Thu, 20 Aug 2009)

Log Message:
-----------
2.5 Paint:

* Weight paint and vertex paint now use the same cursor setup as sculpt

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h	2009-08-20 15:58:28 UTC (rev 22657)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_paint.h	2009-08-20 16:00:17 UTC (rev 22658)
@@ -33,7 +33,12 @@
 struct Paint;
 struct Scene;
 
-void paint_init(struct Paint *p, const char *col);
+extern const char PAINT_CURSOR_SCULPT[3];
+extern const char PAINT_CURSOR_VERTEX_PAINT[3];
+extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
+extern const char PAINT_CURSOR_TEXTURE_PAINT[3];
+
+void paint_init(struct Paint *p, const char col[3]);
 void free_paint(struct Paint *p);
 void copy_paint(struct Paint *orig, struct Paint *new);
 

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-20 15:58:28 UTC (rev 22657)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-20 16:00:17 UTC (rev 22658)
@@ -39,6 +39,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+const char PAINT_CURSOR_SCULPT[3] = {255, 100, 100};
+const char PAINT_CURSOR_VERTEX_PAINT[3] = {255, 255, 255};
+const char PAINT_CURSOR_WEIGHT_PAINT[3] = {200, 200, 255};
+const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255};
+
 Paint *paint_get_active(Scene *sce)
 {
 	if(sce && sce->basact && sce->basact->object) {
@@ -154,7 +159,7 @@
 
 }
 
-void paint_init(Paint *p, const char *col)
+void paint_init(Paint *p, const char col[3])
 {
 	Brush *brush;
 
@@ -163,13 +168,7 @@
 	brush_check_exists(&brush, "Brush");
 	paint_brush_set(p, brush);
 
-	if(col)
-		memcpy(p->paint_cursor_col, col, 3);
-	else {
-		p->paint_cursor_col[0] = 255;
-		p->paint_cursor_col[1] = 255;
-		p->paint_cursor_col[2] = 255;
-	}
+	memcpy(p->paint_cursor_col, col, 3);
 	p->paint_cursor_col[3] = 128;
 }
 

Modified: branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2009-08-20 15:58:28 UTC (rev 22657)
+++ branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2009-08-20 16:00:17 UTC (rev 22658)
@@ -142,56 +142,6 @@
 	return 0;
 }
 
-
-/* Cursors */
-static void vp_drawcursor(bContext *C, int x, int y, void *customdata)
-{
-	Brush *brush = paint_brush(&CTX_data_tool_settings(C)->vpaint->paint);
-	
-	glTranslatef((float)x, (float)y, 0.0f);
-	
-	glColor4ub(255, 255, 255, 128);
-	glEnable( GL_LINE_SMOOTH );
-	glEnable(GL_BLEND);
-	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
-	glDisable(GL_BLEND);
-	glDisable( GL_LINE_SMOOTH );
-	
-	glTranslatef((float)-x, (float)-y, 0.0f);
-}
-
-static void wp_drawcursor(bContext *C, int x, int y, void *customdata)
-{
-	Brush *brush = paint_brush(&CTX_data_tool_settings(C)->wpaint->paint);
-
-	glTranslatef((float)x, (float)y, 0.0f);
-	
-	glColor4ub(200, 200, 255, 128);
-	glEnable( GL_LINE_SMOOTH );
-	glEnable(GL_BLEND);
-	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
-	glDisable(GL_BLEND);
-	glDisable( GL_LINE_SMOOTH );
-	
-	glTranslatef((float)-x, (float)-y, 0.0f);
-}
-
-static void toggle_paint_cursor(bContext *C, int wpaint)
-{
-	ToolSettings *ts = CTX_data_scene(C)->toolsettings;
-	VPaint *vp = wpaint ? ts->wpaint : ts->vpaint;
-
-	if(vp->paintcursor) {
-		WM_paint_cursor_end(CTX_wm_manager(C), vp->paintcursor);
-		vp->paintcursor = NULL;
-	}
-	else {
-		vp->paintcursor = wpaint ?
-			WM_paint_cursor_activate(CTX_wm_manager(C), wp_poll, wp_drawcursor, NULL) :
-			WM_paint_cursor_activate(CTX_wm_manager(C), vp_poll, vp_drawcursor, NULL);
-	}
-}
-
 static VPaint *new_vpaint(int wpaint)
 {
 	VPaint *vp= MEM_callocN(sizeof(VPaint), "VPaint");
@@ -1127,9 +1077,8 @@
 		if(wp==NULL)
 			wp= scene->toolsettings->wpaint= new_vpaint(1);
 
-		paint_init(&wp->paint, NULL);
-
-		toggle_paint_cursor(C, 1);
+		paint_init(&wp->paint, PAINT_CURSOR_WEIGHT_PAINT);
+		paint_cursor_start(C, wp_poll);
 		
 		mesh_octree_table(ob, NULL, NULL, 's');
 		
@@ -1145,9 +1094,6 @@
 		}
 	}
 	else {
-		if(wp)
-			toggle_paint_cursor(C, 1);
-		
 		mesh_octree_table(ob, NULL, NULL, 'e');
 	}
 	
@@ -1188,9 +1134,11 @@
 
 static int vpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->vpaint->paint);
-
-	toggle_paint_cursor(C, 0);
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Brush *brush = paint_brush(p);
+	
+	WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
+	p->paint_cursor = NULL;
 	brush_radial_control_invoke(op, brush, 1);
 	return WM_radial_control_invoke(C, op, event);
 }
@@ -1199,7 +1147,7 @@
 {
 	int ret = WM_radial_control_modal(C, op, event);
 	if(ret != OPERATOR_RUNNING_MODAL)
-		toggle_paint_cursor(C, 0);
+		paint_cursor_start(C, vp_poll);
 	return ret;
 }
 
@@ -1211,8 +1159,11 @@
 
 static int wpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->wpaint->paint);
-	toggle_paint_cursor(C, 1);
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Brush *brush = paint_brush(p);
+	
+	WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
+	p->paint_cursor = NULL;
 	brush_radial_control_invoke(op, brush, 1);
 	return WM_radial_control_invoke(C, op, event);
 }
@@ -1221,7 +1172,7 @@
 {
 	int ret = WM_radial_control_modal(C, op, event);
 	if(ret != OPERATOR_RUNNING_MODAL)
-		toggle_paint_cursor(C, 1);
+		paint_cursor_start(C, wp_poll);
 	return ret;
 }
 
@@ -1614,11 +1565,6 @@
 	if(ob->mode & OB_MODE_VERTEX_PAINT) {
 		
 		ob->mode &= ~OB_MODE_VERTEX_PAINT;
-		
-		if(vp) {
-			toggle_paint_cursor(C, 0);
-			vp->paintcursor= NULL;
-		}
 	}
 	else {
 		ob->mode |= OB_MODE_VERTEX_PAINT;
@@ -1629,9 +1575,9 @@
 		if(vp==NULL)
 			vp= scene->toolsettings->vpaint= new_vpaint(0);
 		
-		toggle_paint_cursor(C, 0);
+		paint_cursor_start(C, vp_poll);
 
-		paint_init(&vp->paint, NULL);
+		paint_init(&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
 	}
 	
 	if (me)

Modified: branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c	2009-08-20 15:58:28 UTC (rev 22657)
+++ branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c	2009-08-20 16:00:17 UTC (rev 22658)
@@ -1549,8 +1549,6 @@
 		free_sculptsession(&ob->sculpt);
 	}
 	else {
-		const char col[3] = {255, 100, 100};
-		
 		/* Enter sculptmode */
 
 		ob->mode |= OB_MODE_SCULPT;
@@ -1564,7 +1562,7 @@
 			free_sculptsession(&ob->sculpt);
 		ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
 
-		paint_init(&ts->sculpt->paint, col);
+		paint_init(&ts->sculpt->paint, PAINT_CURSOR_SCULPT);
 		
 		paint_cursor_start(C, sculpt_poll);
 

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-08-20 15:58:28 UTC (rev 22657)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-08-20 16:00:17 UTC (rev 22658)
@@ -151,7 +151,7 @@
 	Scene *scene= CTX_data_scene(C);
 
 	if(scene)
-		paint_init(&scene->toolsettings->imapaint.paint, NULL);
+		paint_init(&scene->toolsettings->imapaint.paint, PAINT_CURSOR_TEXTURE_PAINT);
 }
 
 static int rna_SpaceImageEditor_show_render_get(PointerRNA *ptr)





More information about the Bf-blender-cvs mailing list