diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:37:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:59:33 +0300 |
| commit | 3f4e3f718fdc1163cc52a84d85978fa94b230211 (patch) | |
| tree | 21bdaae3f63721ac481493a58d9abd37395243ce /intern/cycles/blender/blender_sync.h | |
| parent | a7c5f4f20657e12b43337e32bc62a876cbbe6292 (diff) | |
Cycles: restore old sample and material override settings for view layers.
Since there will be no view layer overrides in 2.80, this is needed still.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 7290ea0cee0..bf16de4a9c9 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -78,6 +78,8 @@ public: void sync_view(BL::SpaceView3D& b_v3d, BL::RegionView3D& b_rv3d, int width, int height); + inline int get_layer_samples() { return view_layer.samples; } + inline int get_layer_bound_samples() { return view_layer.bound_samples; } /* get parameters */ static SceneParams get_scene_params(BL::Scene& b_scene, @@ -191,18 +193,23 @@ private: struct RenderLayerInfo { RenderLayerInfo() - : use_background_shader(true), + : material_override(PointerRNA_NULL), + use_background_shader(true), use_background_ao(true), use_surfaces(true), - use_hair(true) + use_hair(true), + samples(0), + bound_samples(false) {} string name; - uint view_layer; + BL::Material material_override; bool use_background_shader; bool use_background_ao; bool use_surfaces; bool use_hair; + int samples; + bool bound_samples; } view_layer; Progress &progress; |