[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33482] trunk/blender: Object transparency setting should only show on MESH type

[Daniel Salazar]

Revision: 33482
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33482
Author:   zanqdo
Date:     2010-12-05 11:38:45 +0100 (Sun, 05 Dec 2010)

Log Message:
-----------
Object transparency setting should only show on MESH type

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

Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py	2010-12-05 10:14:34 UTC (rev 33481)
+++ trunk/blender/release/scripts/ui/properties_object.py	2010-12-05 10:38:45 UTC (rev 33482)
@@ -217,7 +217,8 @@
         col = split.column()
         col.prop(ob, "show_texture_space", text="Texture Space")
         col.prop(ob, "show_x_ray", text="X-Ray")
-        col.prop(ob, "show_transparent", text="Transparency")
+        if ob.type == 'MESH':
+            col.prop(ob, "show_transparent", text="Transparency")
 
 
 class OBJECT_PT_duplication(ObjectButtonsPanel, bpy.types.Panel):

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-12-05 10:14:34 UTC (rev 33481)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-12-05 10:38:45 UTC (rev 33482)
@@ -2159,7 +2159,7 @@
 	
 	prop= RNA_def_property(srna, "show_transparent", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWTRANSP);
-	RNA_def_property_ui_text(prop, "Draw Transparent", "Enables transparent materials for the object (Mesh only)");
+	RNA_def_property_ui_text(prop, "Draw Transparent", "Displays material transparency in the object");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 	
 	prop= RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE);