Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-09-28 23:56:08 +0400
committerThomas Dinges <blender@dingto.org>2013-09-28 23:56:08 +0400
commitc662b247f6777a1ca9b38cdd71634d516f7fff89 (patch)
tree83342f4872e761ac0d38d5e5f7618bd16df0ab34 /release/scripts/startup/bl_ui/properties_texture.py
parentf18f2fbb33d90ecc91e6f3d063cb9f97f217e808 (diff)
Properties Editor / UI:
* Fix a py error in the "Image Sampling" panel, tex.image can be NULL.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index e1b6aee29ae..86fa1197b89 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -476,7 +476,8 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel):
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")