Revision: 44820
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44820
Author: campbellbarton
Date: 2012-03-12 01:34:38 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
fix [#30472] 3d view objects not rendered, cycles.
holdout layer wasnt initializes in some cases.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_sync.h
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-03-12
00:03:42 UTC (rev 44819)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-03-12
01:34:38 UTC (rev 44820)
@@ -192,6 +192,7 @@
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 {
Modified: trunk/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.h 2012-03-12 00:03:42 UTC
(rev 44819)
+++ trunk/blender/intern/cycles/blender/blender_sync.h 2012-03-12 01:34:38 UTC
(rev 44820)
@@ -106,7 +106,7 @@
struct RenderLayerInfo {
RenderLayerInfo()
- : scene_layer(0), layer(0),
+ : scene_layer(0), layer(0), holdout_layer(0),
material_override(PointerRNA_NULL)
{}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
