[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49099] branches/ge_harmony/source/blender : Fixing up some minor code problems with custom shaders.

Daniel Stokes kupomail at gmail.com
Sat Jul 21 10:15:55 CEST 2012


Revision: 49099
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49099
Author:   kupoman
Date:     2012-07-21 08:15:54 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
Fixing up some minor code problems with custom shaders.

Modified Paths:
--------------
    branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_material.c

Modified: branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
===================================================================
--- branches/ge_harmony/source/blender/makesdna/DNA_material_types.h	2012-07-21 02:09:11 UTC (rev 49098)
+++ branches/ge_harmony/source/blender/makesdna/DNA_material_types.h	2012-07-21 08:15:54 UTC (rev 49099)
@@ -84,7 +84,7 @@
 } GameSettings;
 
 typedef struct CustomShader {
-	struct CustomShader *prev, *next;
+	struct CustomShader *next, *prev;
 	struct Shader *shader;
 } CustomShader;
 

Modified: branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/ge_harmony/source/blender/makesrna/intern/rna_material.c	2012-07-21 02:09:11 UTC (rev 49098)
+++ branches/ge_harmony/source/blender/makesrna/intern/rna_material.c	2012-07-21 08:15:54 UTC (rev 49099)
@@ -205,7 +205,7 @@
 	return rna_pointer_inherit_refine(ptr, &RNA_Shader, shad);
 }
 
-static PointerRNA rna_Material_active_shader_set(PointerRNA *ptr, PointerRNA value)
+static void rna_Material_active_shader_set(PointerRNA *ptr, PointerRNA value)
 {
 	Material *ma = (Material*)ptr->data;
 	Shader *sh = (Shader*)value.data;
@@ -1094,42 +1094,25 @@
 {
 	PropertyRNA *prop;
 
-	prop= RNA_def_property(srna, "shaders", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "shaders", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "custom_shaders", NULL);
-	RNA_def_property_struct_type(prop, "CustomShader");
+	RNA_def_property_struct_type(prop, "ShaderLink");
 	RNA_def_property_ui_text(prop, "Custom Shaders", "User created shaders to override default shaders");
 
-	prop= RNA_def_property(srna, "active_shader", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "active_shader", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "Shader");
 	RNA_def_property_pointer_funcs(prop, "rna_Material_active_shader_get", "rna_Material_active_shader_set", NULL, NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Active Shader", "");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
-	prop= RNA_def_property(srna, "active_shader_index", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "active_shader_index", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "actshader");
 	RNA_def_property_int_funcs(prop, "rna_Material_active_shader_index_get", "rna_Material_active_shader_index_set", "rna_Material_active_shader_index_range");
 	RNA_def_property_ui_text(prop, "Active Shader Index", "");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 }
 
-static void rna_def_material_customshader(BlenderRNA *brna)
-{
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-	srna = RNA_def_struct(brna, "CustomShader", NULL);
-	RNA_def_struct_ui_icon(srna, ICON_TEXT);
-	RNA_def_struct_sdna(srna, "CustomShader");
-
-	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
-	RNA_def_struct_name_property(srna, prop);
-	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_string_funcs(prop, "rna_CustomShader_name_get", "rna_CustomShader_name_length", NULL);
-	RNA_def_property_ui_text(prop, "Name", "The name of the shader");
-}
-
-
 static void rna_def_material_raymirror(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -2185,7 +2168,6 @@
 	rna_def_material_mtex(brna);
 	rna_def_material_strand(brna);
 	rna_def_material_physics(brna);
-	rna_def_material_customshader(brna);
 	rna_def_material_gamesettings(brna);
 
 	RNA_api_material(srna);




More information about the Bf-blender-cvs mailing list