[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25900] trunk/blender/source/blender: remove operators PARTICLE_OT_brush_set and PARTICLE_OT_edit_type_set, rna data access and menu's can replace

[Campbell Barton]

Revision: 25900
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25900
Author:   campbellbarton
Date:     2010-01-11 14:54:00 +0100 (Mon, 11 Jan 2010)

Log Message:
-----------
remove operators PARTICLE_OT_brush_set and PARTICLE_OT_edit_type_set, rna data access and menu's can replace

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/particle_edit.c
    trunk/blender/source/blender/editors/physics/physics_intern.h
    trunk/blender/source/blender/editors/physics/physics_ops.c
    trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2010-01-11 12:24:08 UTC (rev 25899)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2010-01-11 13:54:00 UTC (rev 25900)
@@ -2695,79 +2695,6 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-/*********************** set brush operator **********************/
-
-static EnumPropertyItem brush_type_items[]= {
-	{PE_BRUSH_NONE, "NONE", 0, "None", ""},
-	{PE_BRUSH_COMB, "COMB", 0, "Comb", ""},
-	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", ""},
-	{PE_BRUSH_ADD, "ADD", 0, "Add", ""},
-	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", ""},
-	{PE_BRUSH_PUFF, "PUFF", 0, "Puff", ""},
-	{PE_BRUSH_CUT, "CUT", 0, "Cut", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int set_brush_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	ParticleEditSettings *pset= PE_settings(scene);
-
-	pset->brushtype= RNA_enum_get(op->ptr, "type");
-
-	return OPERATOR_FINISHED;
-}
-
-void PARTICLE_OT_brush_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Set Brush";
-	ot->idname= "PARTICLE_OT_brush_set";
-	
-	/* api callbacks */
-	ot->exec= set_brush_exec;
-	ot->invoke= WM_menu_invoke;
-	ot->poll= PE_poll;
-
-	/* properties */
-	RNA_def_enum(ot->srna, "type", brush_type_items, PE_BRUSH_NONE, "Type", "Brush type to select for editing.");
-}
-
-
-/*********************** set mode operator **********************/
-
-static EnumPropertyItem edit_type_items[]= {
-	{PE_TYPE_PARTICLES, "PARTICLES", 0, "Particles", ""},
-	{PE_TYPE_SOFTBODY, "SOFTBODY", 0, "Soft body", ""},
-	{PE_TYPE_CLOTH, "CLOTH", 0, "Cloth", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int set_edit_mode_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	ParticleEditSettings *pset= PE_settings(scene);
-
-	pset->edittype= RNA_enum_get(op->ptr, "type");
-
-	return OPERATOR_FINISHED;
-}
-
-void PARTICLE_OT_edit_type_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Set Edit Type";
-	ot->idname= "PARTICLE_OT_edit_type_set";
-	
-	/* api callbacks */
-	ot->exec= set_edit_mode_exec;
-	ot->invoke= WM_menu_invoke;
-	ot->poll= PE_poll;
-
-	/* properties */
-	RNA_def_enum(ot->srna, "type", edit_type_items, PE_TYPE_PARTICLES, "Type", "Edit type to select for editing.");
-}
-
 /************************* brush edit callbacks ********************/
 
 static void brush_comb(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key)

Modified: trunk/blender/source/blender/editors/physics/physics_intern.h
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_intern.h	2010-01-11 12:24:08 UTC (rev 25899)
+++ trunk/blender/source/blender/editors/physics/physics_intern.h	2010-01-11 13:54:00 UTC (rev 25900)
@@ -53,7 +53,6 @@
 void PARTICLE_OT_delete(struct wmOperatorType *ot);
 void PARTICLE_OT_mirror(struct wmOperatorType *ot);
 
-void PARTICLE_OT_brush_set(struct wmOperatorType *ot);
 void PARTICLE_OT_brush_edit(struct wmOperatorType *ot);
 void PARTICLE_OT_brush_radial_control(struct wmOperatorType *ot);
 

Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c	2010-01-11 12:24:08 UTC (rev 25899)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c	2010-01-11 13:54:00 UTC (rev 25900)
@@ -60,7 +60,6 @@
 	WM_operatortype_append(PARTICLE_OT_delete);
 	WM_operatortype_append(PARTICLE_OT_mirror);
 
-	WM_operatortype_append(PARTICLE_OT_brush_set);
 	WM_operatortype_append(PARTICLE_OT_brush_edit);
 	WM_operatortype_append(PARTICLE_OT_brush_radial_control);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2010-01-11 12:24:08 UTC (rev 25899)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2010-01-11 13:54:00 UTC (rev 25900)
@@ -36,7 +36,7 @@
 
 #include "WM_types.h"
 
-static EnumPropertyItem particle_edit_hair_brush_items[] = {
+EnumPropertyItem particle_edit_hair_brush_items[] = {
 	{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
 	{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb hairs."},
 	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth hairs."},