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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-14 21:18:14 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-22 12:13:33 +0300
commit9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff (patch)
treed619104ca32c41509a26fd41112ac239674f424b /intern
parent846cdf53187174ac87dd24af4b7b0d413db4ad03 (diff)
SceneRenderLayer > SceneLayer: Remove exclude_layer
Note: It is up to Cycles to still get rid of exclude_layer internally: RenderLayerInfo.exclude_layer
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_sync.cpp2
-rw-r--r--intern/cycles/blender/blender_sync.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index f29d7754dcf..d18a7f25317 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -401,7 +401,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer)
render_layer.name = b_rlay->name();
render_layer.holdout_layer = get_layer(b_rlay->layers_zmask());
- render_layer.exclude_layer = get_layer(b_rlay->layers_exclude());
+ render_layer.exclude_layer = 0;
render_layer.scene_layer = scene_layers & ~render_layer.exclude_layer;
render_layer.scene_layer |= render_layer.exclude_layer & render_layer.holdout_layer;
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 88f7ea7975c..0f9cd86bd3c 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -201,7 +201,7 @@ private:
uint scene_layer;
uint layer;
uint holdout_layer;
- uint exclude_layer;
+ uint exclude_layer; /* This can be safely removed from Cycles. */
BL::Material material_override;
bool use_background_shader;
bool use_background_ao;