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
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-08-24 16:54:48 +0400
committerThomas Dinges <blender@dingto.org>2014-08-24 16:54:48 +0400
commit8ed818e0a1b4e6355413607bda3a01970294f91d (patch)
tree1feb4b94b1a3a27a4f2b42cc5423b963623d0889 /intern
parent7a026971dc3f9392278898cc28d7051f34e3dd6b (diff)
Cycles: Remove Volume Nodes GPU warning and gray out Sampling Method button when using GPU.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 057b59264a4..6f9e95dbb4c 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -929,7 +929,9 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel):
col = split.column()
col.label(text="Volume:")
- col.prop(cworld, "volume_sampling", text="")
+ sub = col.column()
+ sub.active = use_cpu(context)
+ sub.prop(cworld, "volume_sampling", text="")
col.prop(cworld, "homogeneous_volume", text="Homogeneous")
@@ -1031,7 +1033,9 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
col = split.column()
col.label(text="Volume:")
- col.prop(cmat, "volume_sampling", text="")
+ sub = col.column()
+ sub.active = use_cpu(context)
+ sub.prop(cmat, "volume_sampling", text="")
col.prop(cmat, "homogeneous_volume", text="Homogeneous")