[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60413] trunk/blender/release/scripts/ startup/bl_ui/properties_texture.py: Properties Editor / UI:

[Thomas Dinges]

Revision: 60413
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60413
Author:   dingto
Date:     2013-09-28 19:56:08 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Properties Editor / UI:
* Fix a py error in the "Image Sampling" panel, tex.image can be NULL. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_texture.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2013-09-28 19:28:41 UTC (rev 60412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2013-09-28 19:56:08 UTC (rev 60413)
@@ -476,7 +476,8 @@
         col = split.column()
         col.label(text="Alpha:")
         row = col.row()
-        row.active = tex.image and tex.image.use_alpha
+        if not (tex.image and tex.image.use_alpha):
+            row.active = False
         row.prop(tex, "use_alpha", text="Use")
         col.prop(tex, "use_calculate_alpha", text="Calculate")
         col.prop(tex, "invert_alpha", text="Invert")