From 7b38ad7286937d66d45a0c2c4c2d355bfa588e5f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 14 Mar 2019 17:29:18 +0100 Subject: Fix T57138: Cycles CMJ failing with viewport samples set to 0. Can't use INT_MAX, CMJ runs into precision/overflow issues before that. --- intern/cycles/blender/blender_sync.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'intern/cycles/blender/blender_sync.cpp') diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 05979fa4f57..a1202cbbad4 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -794,6 +794,9 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, } } + /* Clamp samples. */ + params.samples = min(params.samples, Integrator::MAX_SAMPLES); + /* tiles */ const bool is_cpu = (params.device.type == DEVICE_CPU); if(!is_cpu && !background) { -- cgit v1.2.3