Cycles: support for multiple render layers. It currently renders each layer

entirely before moving on to the next.

1 files changed, 7 insertions, 4 deletions

diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index cd667205854..60fdd7c386b 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -54,7 +54,7 @@ public:
 
 	/* sync */
 	bool sync_recalc();
-	void sync_data(BL::SpaceView3D b_v3d);
+	void sync_data(BL::SpaceView3D b_v3d, int layer = 0);
 	void sync_camera(int width, int height);
 	void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height);
 
@@ -70,10 +70,10 @@ private:
 	void sync_materials();
 	void sync_objects(BL::SpaceView3D b_v3d);
 	void sync_film();
-	void sync_integrator();
+	void sync_integrator(int layer);
 	void sync_view();
 	void sync_world();
-	void sync_render_layer(BL::SpaceView3D b_v3d);
+	void sync_render_layers(BL::SpaceView3D b_v3d);
 	void sync_shaders();
 
 	void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree);
@@ -112,7 +112,10 @@ private:
 		uint scene_layer;
 		uint layer;
 		BL::Material material_override;
-	} render_layer;
+	};
+
+	vector<RenderLayerInfo> render_layers;
+	int active_layer;
 };
 
 CCL_NAMESPACE_END