Revision: 23883
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23883
Author:   blendix
Date:     2009-10-16 12:03:39 +0200 (Fri, 16 Oct 2009)

Log Message:
-----------
Bugfix: z-offset for materials was not added back yet.

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

Modified: trunk/blender/release/scripts/ui/buttons_material.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_material.py        2009-10-16 
10:01:15 UTC (rev 23882)
+++ trunk/blender/release/scripts/ui/buttons_material.py        2009-10-16 
10:03:39 UTC (rev 23883)
@@ -202,6 +202,9 @@
                col.itemR(mat, "sky")
                col.itemR(mat, "exclude_mist")
                col.itemR(mat, "invert_z")
+               sub = col.row()
+               sub.itemR(mat, "z_offset")
+               sub.active = mat.transparency and mat.transparency_method == 
'Z_TRANSPARENCY'
                sub = col.column(align=True)
                sub.itemL(text="Light Group:")
                sub.itemR(mat, "light_group", text="")

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-16 
10:01:15 UTC (rev 23882)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-16 
10:03:39 UTC (rev 23883)
@@ -1600,6 +1600,11 @@
        RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ZINV);
        RNA_def_property_ui_text(prop, "Invert Z Depth", "Renders material's 
faces with an inverted Z buffer (scanline only).");
        RNA_def_property_update(prop, 0, "rna_Material_update");
+
+       prop= RNA_def_property(srna, "z_offset", PROP_FLOAT, PROP_NONE);
+       RNA_def_property_float_sdna(prop, NULL, "zoffs");
+       RNA_def_property_ui_text(prop, "Z Offset", "Gives faces an artificial 
offset in the Z buffer for Z transparency.");
+       RNA_def_property_update(prop, 0, "rna_Material_update");
        
        prop= RNA_def_property(srna, "sky", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ENV);


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to