diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-12 05:34:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-12 05:34:38 +0400 |
| commit | a04f44f4866138ebcec309b7f2ec48addc504374 (patch) | |
| tree | d52735f6203214595c1d9186a9c45a184a519409 /intern | |
| parent | 7afeb21a419a86aef36bcded1470b941a40f27c9 (diff) | |
fix [#30472] 3d view objects not rendered, cycles.
holdout layer wasnt initializes in some cases.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index defdb7b447d..9fb2c6e1328 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -192,6 +192,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer) if(b_v3d) { render_layer.scene_layer = get_layer(b_v3d.layers()); render_layer.layer = render_layer.scene_layer; + render_layer.holdout_layer = 0; render_layer.material_override = PointerRNA_NULL; } else { diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 87080e23f28..bfb530c9f99 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -106,7 +106,7 @@ private: struct RenderLayerInfo { RenderLayerInfo() - : scene_layer(0), layer(0), + : scene_layer(0), layer(0), holdout_layer(0), material_override(PointerRNA_NULL) {} |