diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-16 20:18:14 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-16 20:18:14 +0400 |
| commit | c9fc3874d68630c3a4ebeca0c7ae964e5c9a901f (patch) | |
| tree | 7b05c3a409c61228b7b93a2d83a9e9558d0eafe4 /intern/cycles/blender/blender_sync.h | |
| parent | c1276960e8714828645899391e924f44d13d1043 (diff) | |
Cycles: when render layers have per layer number of samples set, the Sampling
panel now has an option to specify how to use them. There's three options:
* Use: render layer samples override scene samples
* Bounded: bound render layer samples by scene samples
* Ignore: ignore render layer sample settings
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 43073ed9dee..43c8906c799 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -59,6 +59,7 @@ public: void sync_camera(BL::RenderSettings b_render, BL::Object b_override, int width, int height); void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height); int get_layer_samples() { return render_layer.samples; } + int get_layer_bound_samples() { return render_layer.bound_samples; } /* get parameters */ static SceneParams get_scene_params(BL::Scene b_scene, bool background); @@ -124,7 +125,7 @@ private: material_override(PointerRNA_NULL), use_background(true), use_viewport_visibility(false), - samples(0) + samples(0), bound_samples(false) {} string name; @@ -137,6 +138,7 @@ private: bool use_viewport_visibility; bool use_localview; int samples; + bool bound_samples; } render_layer; Progress &progress; |