diff options
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 10 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index faf057e13cc..9eb8f251ebb 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -179,6 +179,7 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col.prop(scene, "layers", text="Scene") col.label(text="Material:") col.prop(rl, "material_override", text="") + col.prop(rl, "use_zmask"); col = split.column() col.prop(rl, "layers", text="Layer") diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index a88bcaf3ace..415a043cf78 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -700,14 +700,12 @@ void BlenderSync::sync_world() if(b_world) { BL::WorldLighting b_light = b_world.light_settings(); - if(b_light.use_ambient_occlusion()) { + if(b_light.use_ambient_occlusion()) background->ao_factor = b_light.ao_factor(); - background->ao_distance = b_light.distance(); - } - else { + else background->ao_factor = 0.0f; - background->ao_distance = 0.0f; - } + + background->ao_distance = b_light.distance(); } shader->set_graph(graph); diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 901b1a09f97..45ed7adcfdc 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -204,7 +204,8 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer) render_layer.name = b_rlay->name(); render_layer.scene_layer = get_layer(b_scene.layers()); render_layer.layer = get_layer(b_rlay->layers()); - render_layer.holdout_layer = get_layer(b_rlay->layers_zmask()); + render_layer.holdout_layer = (b_rlay->use_zmask())? ~get_layer(b_rlay->layers_zmask()): 0; + render_layer.layer |= render_layer.holdout_layer; render_layer.material_override = b_rlay->material_override(); } |