From e22ca0fb860ed945eb3438bfe6dba8040cfd7cf3 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 15 Nov 2017 12:17:54 -0200 Subject: 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. --- intern/cycles/blender/blender_sync.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/blender/blender_sync.h') 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; -- cgit v1.2.3