[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31555] trunk/blender: remove rna function template_triColorSet(), was only used in one place and can be done just as well with 3 function calls .

[Campbell Barton]

Revision: 31555
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31555
Author:   campbellbarton
Date:     2010-08-25 02:34:40 +0200 (Wed, 25 Aug 2010)

Log Message:
-----------
remove rna function template_triColorSet(), was only used in one place and can be done just as well with 3 function calls.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_armature.py
    trunk/blender/source/blender/editors/include/UI_interface.h
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py	2010-08-25 00:21:34 UTC (rev 31554)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py	2010-08-25 00:34:40 UTC (rev 31555)
@@ -139,7 +139,10 @@
             col.prop(group, "color_set")
             if group.color_set:
                 col = split.column()
-                col.template_triColorSet(group, "colors")
+                subrow = col.row(align=True)
+                subrow.prop(group.colors, "normal", text="")
+                subrow.prop(group.colors, "select", text="")
+                subrow.prop(group.colors, "active", text="")
 
         row = layout.row()
         row.active = (ob.proxy is None)

Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h	2010-08-25 00:21:34 UTC (rev 31554)
+++ trunk/blender/source/blender/editors/include/UI_interface.h	2010-08-25 00:34:40 UTC (rev 31555)
@@ -687,7 +687,6 @@
 void uiTemplateVectorscope(uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand);
 void uiTemplateCurveMapping(uiLayout *layout, struct PointerRNA *ptr, char *propname, int type, int levels, int brush);
 void uiTemplateColorWheel(uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider, int lock, int lock_luminosity, int cubic);
-void uiTemplateTriColorSet(uiLayout *layout, struct PointerRNA *ptr, char *propname);
 void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, char *propname,
 			  PointerRNA *used_ptr, char *used_propname, int active_layer);
 void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *userptr, int compact);

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-08-25 00:21:34 UTC (rev 31554)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-08-25 00:34:40 UTC (rev 31555)
@@ -1884,31 +1884,6 @@
 		uiDefButR(block, HSVCUBE, 0, "", WHEEL_SIZE+6, 0, 14, WHEEL_SIZE, ptr, propname, -1, softmin, softmax, 9, 0, "");
 }
 
-
-/********************* TriColor (ThemeWireColorSet) Template ************************/
-
-void uiTemplateTriColorSet(uiLayout *layout, PointerRNA *ptr, char *propname)
-{
-	PropertyRNA *prop= RNA_struct_find_property(ptr, propname);
-	uiLayout *row;
-	PointerRNA csPtr;
-
-	if (!prop) {
-		printf("uiTemplateTriColorSet: property not found: %s.%s\n", RNA_struct_identifier(ptr->type), propname);
-		return;
-	}
-	
-	/* we lay out the data in a row as 3 color swatches */
-	row= uiLayoutRow(layout, 1);
-	
-	/* nselected, selected, active color swatches */
-	csPtr= RNA_property_pointer_get(ptr, prop);
-	
-	uiItemR(row, &csPtr, "normal", 0, "", 0);
-	uiItemR(row, &csPtr, "select", 0, "", 0);
-	uiItemR(row, &csPtr, "active", 0, "", 0);
-}
-
 /********************* Layer Buttons Template ************************/
 
 static void handle_layer_buttons(bContext *C, void *arg1, void *arg2)

Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c	2010-08-25 00:21:34 UTC (rev 31554)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c	2010-08-25 00:34:40 UTC (rev 31555)
@@ -376,9 +376,6 @@
 	RNA_def_boolean(func, "lock", 0, "", "Lock the color wheel display to value 1.0 regardless of actual color");
 	RNA_def_boolean(func, "lock_luminosity", 0, "", "Keep the color at its original vector length");
 	RNA_def_boolean(func, "cubic", 1, "", "Cubic saturation for picking values close to white");
-	
-	func= RNA_def_function(srna, "template_triColorSet", "uiTemplateTriColorSet");
-	api_ui_item_rna_common(func);
 
 	func= RNA_def_function(srna, "template_image_layers", "uiTemplateImageLayers");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-08-25 00:21:34 UTC (rev 31554)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-08-25 00:34:40 UTC (rev 31555)
@@ -310,7 +310,6 @@
 void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, int type, int compact){}
 void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand){}
 void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
-void uiTemplateTriColorSet(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
 void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser){}
 ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype){struct ListBase b = {0,0}; return b;}
 void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){}