[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31367] branches/soc-2010-moguri-2: Use External Shaders -> Use External Sources

Mitchell Stokes mogurijin at gmail.com
Mon Aug 16 08:31:49 CEST 2010


Revision: 31367
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31367
Author:   moguri
Date:     2010-08-16 08:31:49 +0200 (Mon, 16 Aug 2010)

Log Message:
-----------
Use External Shaders -> Use External Sources

Modified Paths:
--------------
    branches/soc-2010-moguri-2/release/scripts/ui/properties_material.py
    branches/soc-2010-moguri-2/source/blender/makesrna/intern/rna_material.c

Modified: branches/soc-2010-moguri-2/release/scripts/ui/properties_material.py
===================================================================
--- branches/soc-2010-moguri-2/release/scripts/ui/properties_material.py	2010-08-16 06:20:33 UTC (rev 31366)
+++ branches/soc-2010-moguri-2/release/scripts/ui/properties_material.py	2010-08-16 06:31:49 UTC (rev 31367)
@@ -759,9 +759,9 @@
 		
         mat = active_node_mat(context.material)
 
-        col.prop(mat, "use_external_shaders")
+        col.prop(mat, "use_external_sources")
 
-        if mat.use_external_shaders:
+        if mat.use_external_sources:
             col.prop(mat, "vertex_shader")
             col.prop(mat, "geometry_shader")
             col.prop(mat, "fragment_shader")

Modified: branches/soc-2010-moguri-2/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/soc-2010-moguri-2/source/blender/makesrna/intern/rna_material.c	2010-08-16 06:20:33 UTC (rev 31366)
+++ branches/soc-2010-moguri-2/source/blender/makesrna/intern/rna_material.c	2010-08-16 06:31:49 UTC (rev 31367)
@@ -994,9 +994,9 @@
 	RNA_def_property_ui_text(prop, "Fragment Shader", "A custom GLSL fragment shader in a text block");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
-	prop= RNA_def_property(srna, "use_external_shaders", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_external_sources", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "csi.flag", MA_CS_USE_EXTERNAL);
-	RNA_def_property_ui_text(prop, "Use External Shaders", "Use shaders from files instead of text datablocks.");
+	RNA_def_property_ui_text(prop, "Use External Sources", "Use shader sources from files instead of text datablocks.");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
 	prop= RNA_def_property(srna, "fragment_shader", PROP_STRING, PROP_NONE);





More information about the Bf-blender-cvs mailing list