diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-28 20:44:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-28 20:44:45 +0400 |
| commit | 0052cbed0dadafce44f818d3d2016254c3d914d0 (patch) | |
| tree | fb0062bb4157358be480b9f5fd63391ab7574936 /intern/cycles/blender/blender_sync.h | |
| parent | aecff24add56e6724744928efe5ad7f1947416b7 (diff) | |
Cycles: support for mask layers in render layer, this has the same effect as
assigning holdout shaders to every object in the specified layers.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes#Layers
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index b0bd3004492..87080e23f28 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -70,14 +70,14 @@ private: void sync_materials(); void sync_objects(BL::SpaceView3D b_v3d); void sync_film(); - void sync_integrator(const char *layer); + void sync_integrator(); void sync_view(); void sync_world(); - void sync_render_layers(BL::SpaceView3D b_v3d); + void sync_render_layers(BL::SpaceView3D b_v3d, const char *layer); void sync_shaders(); void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree); - Mesh *sync_mesh(BL::Object b_ob, bool object_updated); + Mesh *sync_mesh(BL::Object b_ob, bool holdout, bool object_updated); void sync_object(BL::Object b_parent, int b_index, BL::Object b_object, Transform& tfm, uint layer_flag); void sync_light(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm); void sync_background_light(); @@ -113,11 +113,9 @@ private: string name; uint scene_layer; uint layer; + uint holdout_layer; BL::Material material_override; - }; - - vector<RenderLayerInfo> render_layers; - int active_layer; + } render_layer; }; CCL_NAMESPACE_END |