[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23636] trunk/blender: Fixed [#19539] Texture > RGB Factor property doesn't appear in the UI

[Thomas Dinges]

Revision: 23636
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23636
Author:   dingto
Date:     2009-10-05 17:59:12 +0200 (Mon, 05 Oct 2009)

Log Message:
-----------
Fixed [#19539] Texture > RGB Factor property doesn't appear in the UI

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_texture.py
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/release/scripts/ui/buttons_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-05 15:00:07 UTC (rev 23635)
+++ trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-05 15:59:12 UTC (rev 23636)
@@ -99,10 +99,15 @@
 			layout.template_color_ramp(tex, "color_ramp", expand=True)
 
 		split = layout.split()
-		
-		split.itemR(tex, "rgb_factor", text="Multiply RGB")
 
 		col = split.column()
+		col.itemL(text="RGB Multiply:")
+		sub = col.column(align=True)
+		sub.itemR(tex, "factor_red", text="R")
+		sub.itemR(tex, "factor_green", text="G")
+		sub.itemR(tex, "factor_blue", text="B")
+
+		col = split.column()
 		col.itemL(text="Adjust:")
 		col.itemR(tex, "brightness")
 		col.itemR(tex, "contrast")

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-10-05 15:00:07 UTC (rev 23635)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-10-05 15:59:12 UTC (rev 23636)
@@ -1653,14 +1653,26 @@
 	RNA_def_property_range(prop, 0.01, 5);
 	RNA_def_property_ui_text(prop, "Contrast", "");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
-
-	prop= RNA_def_property(srna, "rgb_factor", PROP_FLOAT, PROP_RGB);
+	
+	/* RGB Factor */
+	prop= RNA_def_property(srna, "factor_red", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rfac");
-	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, 0, 2);
-	RNA_def_property_ui_text(prop, "RGB Factor", "");
+	RNA_def_property_ui_text(prop, "Factor Red", "");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 	
+	prop= RNA_def_property(srna, "factor_green", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "gfac");
+	RNA_def_property_range(prop, 0, 2);
+	RNA_def_property_ui_text(prop, "Factor Green", "");
+	RNA_def_property_update(prop, 0, "rna_Texture_update");
+	
+	prop= RNA_def_property(srna, "factor_blue", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "bfac");
+	RNA_def_property_range(prop, 0, 2);
+	RNA_def_property_ui_text(prop, "Factor Blue", "");
+	RNA_def_property_update(prop, 0, "rna_Texture_update");
+	
 	/* nodetree */
 	prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1);