[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28850] branches/soc-2010-moguri: Adding geometry Text datablocks to the ui.

[Mitchell Stokes]

Revision: 28850
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28850
Author:   moguri
Date:     2010-05-19 08:15:33 +0200 (Wed, 19 May 2010)

Log Message:
-----------
Adding geometry Text datablocks to the ui.

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

Modified: branches/soc-2010-moguri/release/scripts/ui/properties_material.py
===================================================================
--- branches/soc-2010-moguri/release/scripts/ui/properties_material.py	2010-05-19 06:07:05 UTC (rev 28849)
+++ branches/soc-2010-moguri/release/scripts/ui/properties_material.py	2010-05-19 06:15:33 UTC (rev 28850)
@@ -791,6 +791,7 @@
         mat = active_node_mat(context.material)
 		
         col.prop(mat, "vertex_text")
+        col.prop(mat, "geometry_text")
         col.prop(mat, "fragment_text")
 
         col.prop(mat, "vertex_shader")

Modified: branches/soc-2010-moguri/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/soc-2010-moguri/source/blender/makesrna/intern/rna_material.c	2010-05-19 06:07:05 UTC (rev 28849)
+++ branches/soc-2010-moguri/source/blender/makesrna/intern/rna_material.c	2010-05-19 06:15:33 UTC (rev 28850)
@@ -1515,6 +1515,13 @@
 	RNA_def_property_ui_text(prop, "Vertex Shader", "A custom GLSL vertex shader in a text block");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
+	prop= RNA_def_property(srna, "geometry_text", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "geom_text");
+	RNA_def_property_struct_type(prop, "Text");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Geometry Shader", "A custom GLSL geometry shader in a text block");
+	RNA_def_property_update(prop, 0, "rna_Material_update");
+
 	prop= RNA_def_property(srna, "fragment_text", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "frag_text");
 	RNA_def_property_struct_type(prop, "Text");