diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 17:17:54 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
commit | e22ca0fb860ed945eb3438bfe6dba8040cfd7cf3 (patch) | |
tree | 0e7cfbecb035d9096559e1871796ca92ec6d3a99 /intern/cycles/blender/blender_sync.h | |
parent | 05306d97663b4281d4b17bfc7e1ed913ce07966f (diff) |
SceneRenderLayer > SceneLayer: Convert samples_override
Note: Cycles still need to handle its own doversion for theses cases and
(1) Remove the override as it is
(2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE
Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index a0cbc45da98..a68b6a03906 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -207,8 +207,8 @@ private: bool use_background_ao; bool use_surfaces; bool use_hair; - int samples; - bool bound_samples; + int samples; /* This can be safely removed from Cycles. */ + bool bound_samples; /* This can be safely removed from Cycles. */ } render_layer; Progress &progress; |