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>2019-03-17 14:54:19 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-17 14:54:19 +0300
commite69192968616b17709e6a3bd0d2dc59d463c52ba (patch)
tree4018a1dc7f631ad340b11c0b738fade9f24d0c6e /intern/cycles/blender
parent0af22625c9f9357e873160d265b9eae4a43a549d (diff)
parent9d2397c710af9180e7e2ec6db42e8513390b4ab1 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/blender_sync.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 91317cbb81b..4074d7c99e2 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -510,10 +510,6 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
vector<Pass> passes;
Pass::add(PASS_COMBINED, passes);
- if(!session_params.device.advanced_shading) {
- return passes;
- }
-
/* loop over passes */
BL::RenderLayer::passes_iterator b_pass_iter;