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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-24 22:05:07 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-24 22:53:14 +0400
commit88f1c283a773bb76334d2d6a849d4e45c5c95373 (patch)
treeccf09296aa15c2991fc2db6a3587f408fafea2a2 /intern/cycles/blender/addon
parente2734eb1dd552f9a01ffc878aeac9299ca02ab0c (diff)
Tweak to T38766 fix: cycles now support setting viewport alpha for a material.
Diffstat (limited to 'intern/cycles/blender/addon')
-rw-r--r--intern/cycles/blender/addon/ui.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index cb50db23767..a3138266b20 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1001,8 +1001,9 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
split = layout.split()
- col = split.column()
+ col = split.column(align=True)
col.prop(mat, "diffuse_color", text="Viewport Color")
+ col.prop(mat, "alpha")
col = split.column(align=True)
col.label()