archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for cycles bug in localview: see r48269, bits used for localview gave collisions with PathRayFlag's

Browse Source
This commit is contained in:
Campbell Barton
2012-07-23 14:48:19 +00:00
parent a5d08781fc
commit 5412389af6
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/blender_sync.cpp
View File

@@ -219,7 +219,9 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer)
layer = layername.c_str();
}
else {
render_layer.use_localview = (b_v3d.local_view() ? true : false);
render_layer.scene_layer = get_layer(b_v3d.layers(), b_v3d.layers_local_view());
CYCLES_LOCAL_LAYER_HACK(render_layer.use_localview, render_layer.scene_layer);
render_layer.layer = render_layer.scene_layer;
render_layer.holdout_layer = 0;
render_layer.material_override = PointerRNA_NULL;
@@ -245,6 +247,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer)
render_layer.material_override = b_rlay->material_override();
render_layer.use_background = b_rlay->use_sky();
render_layer.use_viewport_visibility = false;
render_layer.use_localview = false;
render_layer.samples = b_rlay->samples();
}