[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30723] trunk/blender/source/blender: == Sculpt ==

Nicholas Bishop nicholasbishop at gmail.com
Mon Jul 26 00:05:52 CEST 2010


Revision: 30723
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30723
Author:   nicholasbishop
Date:     2010-07-26 00:05:52 +0200 (Mon, 26 Jul 2010)

Log Message:
-----------
== Sculpt ==

Minor sculpt cleanups

* Moved the (previously extern) declarations of the brush icon data to ED_datafiles.h
* Set sculpt tool RNA to alphabetical order, quite a long list now

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_datafiles.h
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/source/blender/editors/include/ED_datafiles.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_datafiles.h	2010-07-25 17:19:55 UTC (rev 30722)
+++ trunk/blender/source/blender/editors/include/ED_datafiles.h	2010-07-25 22:05:52 UTC (rev 30723)
@@ -52,5 +52,93 @@
 extern int datatoc_bmonofont_ttf_size;
 extern char datatoc_bmonofont_ttf[];
 
+/* Brush icon datafiles */
+/* TODO: this could be simplified by putting all
+   the brush icons in one file */
+extern int datatoc_add_png_size;
+extern char datatoc_add_png[];
+
+extern int datatoc_blob_png_size;
+extern char datatoc_blob_png[];
+
+extern int datatoc_blur_png_size;
+extern char datatoc_blur_png[];
+
+extern int datatoc_clay_png_size;
+extern char datatoc_clay_png[];
+
+extern int datatoc_clone_png_size;
+extern char datatoc_clone_png[];
+
+extern int datatoc_crease_png_size;
+extern char datatoc_crease_png[];
+
+extern int datatoc_darken_png_size;
+extern char datatoc_darken_png[];
+
+extern int datatoc_draw_png_size;
+extern char datatoc_draw_png[];
+
+extern int datatoc_fill_png_size;
+extern char datatoc_fill_png[];
+
+extern int datatoc_flatten_png_size;
+extern char datatoc_flatten_png[];
+
+extern int datatoc_grab_png_size;
+extern char datatoc_grab_png[];
+
+extern int datatoc_inflate_png_size;
+extern char datatoc_inflate_png[];
+
+extern int datatoc_layer_png_size;
+extern char datatoc_layer_png[];
+
+extern int datatoc_lighten_png_size;
+extern char datatoc_lighten_png[];
+
+extern int datatoc_mix_png_size;
+extern char datatoc_mix_png[];
+
+extern int datatoc_multiply_png_size;
+extern char datatoc_multiply_png[];
+
+extern int datatoc_nudge_png_size;
+extern char datatoc_nudge_png[];
+
+extern int datatoc_pinch_png_size;
+extern char datatoc_pinch_png[];
+
+extern int datatoc_scrape_png_size;
+extern char datatoc_scrape_png[];
+
+extern int datatoc_smear_png_size;
+extern char datatoc_smear_png[];
+
+extern int datatoc_smooth_png_size;
+extern char datatoc_smooth_png[];
+
+extern int datatoc_snake_hook_png_size;
+extern char datatoc_snake_hook_png[];
+
+extern int datatoc_soften_png_size;
+extern char datatoc_soften_png[];
+
+extern int datatoc_subtract_png_size;
+extern char datatoc_subtract_png[];
+
+extern int datatoc_texdraw_png_size;
+extern char datatoc_texdraw_png[];
+
+extern int datatoc_thumb_png_size;
+extern char datatoc_thumb_png[];
+
+extern int datatoc_twist_png_size;
+extern char datatoc_twist_png[];
+
+extern int datatoc_vertexdraw_png_size;
+extern char datatoc_vertexdraw_png[];
+
+
 #endif /* ED_DATAFILES_H */
 

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-07-25 17:19:55 UTC (rev 30722)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-07-25 22:05:52 UTC (rev 30723)
@@ -85,6 +85,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_datafiles.h"
 #include "ED_render.h"
 #include "ED_view3d.h"
 
@@ -103,68 +104,6 @@
 
 ImBuf* get_brush_icon(Brush *brush)
 {
-	/* Sculpt */
-	extern char datatoc_blob_png;
-	extern char datatoc_clay_png;
-	extern char datatoc_crease_png;
-	extern char datatoc_draw_png;
-	extern char datatoc_fill_png;
-	extern char datatoc_flatten_png;
-	extern char datatoc_grab_png;
-	extern char datatoc_inflate_png;
-	extern char datatoc_layer_png;
-	extern char datatoc_nudge_png;
-	extern char datatoc_pinch_png;
-	extern char datatoc_scrape_png;
-	extern char datatoc_smooth_png;
-	extern char datatoc_snake_hook_png;
-	extern char datatoc_thumb_png;
-	extern char datatoc_twist_png;
-
-	/* Paint */
-	extern char datatoc_add_png;
-	extern char datatoc_blur_png;
-	extern char datatoc_clone_png;
-	extern char datatoc_darken_png;
-	extern char datatoc_lighten_png;
-	extern char datatoc_mix_png;
-	extern char datatoc_multiply_png;
-	extern char datatoc_smear_png;
-	extern char datatoc_soften_png;
-	extern char datatoc_subtract_png;
-	extern char datatoc_texdraw_png;
-	extern char datatoc_vertexdraw_png;
-
-	extern int datatoc_blob_png_size;
-	extern int datatoc_clay_png_size;
-	extern int datatoc_crease_png_size;
-	extern int datatoc_draw_png_size;
-	extern int datatoc_fill_png_size;
-	extern int datatoc_flatten_png_size;
-	extern int datatoc_grab_png_size;
-	extern int datatoc_inflate_png_size;
-	extern int datatoc_layer_png_size;
-	extern int datatoc_nudge_png_size;
-	extern int datatoc_pinch_png_size;
-	extern int datatoc_scrape_png_size;
-	extern int datatoc_smooth_png_size;
-	extern int datatoc_snake_hook_png_size;
-	extern int datatoc_thumb_png_size;
-	extern int datatoc_twist_png_size;
-
-	extern int datatoc_add_png_size;
-	extern int datatoc_blur_png_size;
-	extern int datatoc_clone_png_size;
-	extern int datatoc_darken_png_size;
-	extern int datatoc_lighten_png_size;
-	extern int datatoc_mix_png_size;
-	extern int datatoc_multiply_png_size;
-	extern int datatoc_smear_png_size;
-	extern int datatoc_soften_png_size;
-	extern int datatoc_subtract_png_size;
-	extern int datatoc_texdraw_png_size;
-	extern int datatoc_vertexdraw_png_size;
-
 	void *icon_data[]= {
 		0,
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2010-07-25 17:19:55 UTC (rev 30722)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2010-07-25 22:05:52 UTC (rev 30723)
@@ -240,23 +240,22 @@
 		{0, NULL, 0, NULL, NULL}};
 	
 	static EnumPropertyItem brush_sculpt_tool_items[] = {
-		{SCULPT_TOOL_DRAW, "DRAW", 0, "Draw", ""},
-		{SCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", ""},
-		{SCULPT_TOOL_CREASE, "CREASE", 0, "Crease", ""},
 		{SCULPT_TOOL_BLOB, "BLOB", 0, "Blob", ""},
-		{SCULPT_TOOL_PINCH, "PINCH", 0, "Pinch", ""},
-		{SCULPT_TOOL_INFLATE, "INFLATE", 0, "Inflate", ""},
-		{SCULPT_TOOL_GRAB, "GRAB", 0, "Grab", ""},
-		{SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", 0, "Snake Hook", ""},
-		{SCULPT_TOOL_ROTATE, "ROTATE", 0, "Rotate", ""},
-		{SCULPT_TOOL_THUMB, "THUMB", 0, "Thumb", ""},
-		{SCULPT_TOOL_NUDGE, "NUDGE", 0, "Nudge", ""},
-		{SCULPT_TOOL_LAYER, "LAYER", 0, "Layer", ""},
-		{SCULPT_TOOL_FLATTEN, "FLATTEN", 0, "Flatten", ""},
 		{SCULPT_TOOL_CLAY, "CLAY", 0, "Clay", ""},
-		//{SCULPT_TOOL_CLAY_TUBES, "CLAY_TUBES", 0, "Clay Tubes", ""}, XXX: remove clay tubes from UI
+		{SCULPT_TOOL_CREASE, "CREASE", 0, "Crease", ""},
+		{SCULPT_TOOL_DRAW, "DRAW", 0, "Draw", ""},
 		{SCULPT_TOOL_FILL, "FILL", 0, "Fill", ""},
+		{SCULPT_TOOL_FLATTEN, "FLATTEN", 0, "Flatten", ""},
+		{SCULPT_TOOL_GRAB, "GRAB", 0, "Grab", ""},
+		{SCULPT_TOOL_INFLATE, "INFLATE", 0, "Inflate", ""},
+		{SCULPT_TOOL_LAYER, "LAYER", 0, "Layer", ""},
+		{SCULPT_TOOL_NUDGE, "NUDGE", 0, "Nudge", ""},
+		{SCULPT_TOOL_PINCH, "PINCH", 0, "Pinch", ""},
+		{SCULPT_TOOL_ROTATE, "ROTATE", 0, "Rotate", ""},
 		{SCULPT_TOOL_SCRAPE, "SCRAPE", 0, "Scrape", ""},
+		{SCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", ""},
+		{SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", 0, "Snake Hook", ""},
+		{SCULPT_TOOL_THUMB, "THUMB", 0, "Thumb", ""},
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem brush_stroke_method_items[] = {





More information about the Bf-blender-cvs mailing list