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 <brecht@blender.org>2021-06-28 14:56:52 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-06-28 14:57:12 +0300
commitce25b5812b4ad2f9c6d29bf254374235bc7100f7 (patch)
tree99842180d38129af91804a862f512360b389475c /intern
parent7d281a4f7d354d270fc9c9f3c7a65b4409362aa0 (diff)
Fix Cycles not rendering motion vector passes after recent changes
Causing regression tests to fail.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_sync.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index b77051b2419..3b3a193b3e8 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -603,8 +603,10 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
for (BL::RenderPass &b_pass : b_rlay.passes) {
PassType pass_type = get_pass_type(b_pass);
- if (pass_type == PASS_MOTION && view_layer.use_motion_blur)
+ if (pass_type == PASS_MOTION &&
+ (b_view_layer.use_motion_blur() && b_scene.render().use_motion_blur())) {
continue;
+ }
if (pass_type != PASS_NONE)
Pass::add(pass_type, passes, b_pass.name().c_str());
}