[Bf-blender-cvs] [e1a0983b3c4] master: Fix T91608: Cycles crash with tile size 0

Brecht Van Lommel noreply at git.blender.org
Wed Sep 22 18:12:52 CEST 2021


Commit: e1a0983b3c49f79660e907bd78fb18be54bc05ce
Author: Brecht Van Lommel
Date:   Wed Sep 22 18:11:15 2021 +0200
Branches: master
https://developer.blender.org/rBe1a0983b3c49f79660e907bd78fb18be54bc05ce

Fix T91608: Cycles crash with tile size 0

===================================================================

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/blender_sync.cpp

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index c2570e71efd..5fb0eeed925 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -746,7 +746,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Tile Size",
         default=2048,
         description="",
-        min=0, max=16384,
+        min=8, max=16384,
     )
 
     # Various fine-tuning debug flags
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index d6fc7ee1723..717f301b03e 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -855,7 +855,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine &b_engine,
 
   if (background) {
     params.use_auto_tile = RNA_boolean_get(&cscene, "use_auto_tile");
-    params.tile_size = get_int(cscene, "tile_size");
+    params.tile_size = max(get_int(cscene, "tile_size"), 8);
   }
   else {
     params.use_auto_tile = false;



More information about the Bf-blender-cvs mailing list