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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-07-21 02:02:21 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-07-21 02:03:12 +0300
commit97ef8777fcd2228e1787d79572b5491387a3eeee (patch)
treef4652d96508c58296adaa41d77020792040d9b34 /intern
parenta2a1b34cd1657dbc3d84cafe20a7cb4668b2d8de (diff)
Fix T48908: gray out Cycles motion vector pass if motion blur is enabled, doesn't work then.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 10c8959172d..6656beb4478 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -459,7 +459,9 @@ class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel):
col.prop(rl, "use_pass_z")
col.prop(rl, "use_pass_mist")
col.prop(rl, "use_pass_normal")
- col.prop(rl, "use_pass_vector")
+ row = col.row()
+ row.prop(rl, "use_pass_vector")
+ row.active = not rd.use_motion_blur
col.prop(rl, "use_pass_uv")
col.prop(rl, "use_pass_object_index")
col.prop(rl, "use_pass_material_index")