[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23719] trunk/blender/source/blender: toggle buttons for texture channels (hardcoded like UV layer buttons)

Campbell Barton ideasman42 at gmail.com
Thu Oct 8 17:29:43 CEST 2009


Revision: 23719
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23719
Author:   campbellbarton
Date:     2009-10-08 17:29:43 +0200 (Thu, 08 Oct 2009)

Log Message:
-----------
toggle buttons for texture channels (hardcoded like UV layer buttons)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/makesrna/intern/rna_material.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2009-10-08 15:28:31 UTC (rev 23718)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2009-10-08 15:29:43 UTC (rev 23719)
@@ -2070,6 +2070,10 @@
 						uiDefIconButR(block, TOG, 0, ICON_SCENE, 0, 0, UI_UNIT_X, UI_UNIT_Y, &itemptr, "active_render", 0, 0, 0, 0, 0, NULL);
 						uiBlockSetEmboss(block, UI_EMBOSS);
 					}
+					else if (itemptr.type == &RNA_MaterialTextureSlot) {
+						uiDefButR(block, OPTION, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, ptr, "use_textures", i, 0, 0, 0, 0,  NULL);
+					}
+					/* XXX - end hardcoded cruft */
 
 					if(name)
 						MEM_freeN(name);

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c	2009-10-08 15:28:31 UTC (rev 23718)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c	2009-10-08 15:29:43 UTC (rev 23719)
@@ -1730,6 +1730,13 @@
 	rna_def_mtex_common(srna, "rna_Material_mtex_begin", "rna_Material_active_texture_get",
 		"rna_Material_active_texture_set", "MaterialTextureSlot", "rna_Material_update");
 	
+	/* only material has this one */
+	prop= RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "septex", 1);
+	RNA_def_property_array(prop, 18);
+	RNA_def_property_ui_text(prop, "Use Textures", "Enable/Disable each texture.");
+	RNA_def_property_update(prop, 0, "rna_Material_update");
+
 	rna_def_material_colors(srna);
 	rna_def_material_diffuse(srna);
 	rna_def_material_specularity(srna);





More information about the Bf-blender-cvs mailing list