[Bf-blender-cvs] [398baef] master: Fix T47132: Cycles Rendering Tiles Indicator Limited to 16

Sergey Sharybin noreply at git.blender.org
Sat Jan 23 21:52:27 CET 2016


Commit: 398baef6c830fad7ec2ffb75801713775c348f7c
Author: Sergey Sharybin
Date:   Sun Jan 24 01:31:36 2016 +0500
Branches: master
https://developer.blender.org/rB398baef6c830fad7ec2ffb75801713775c348f7c

Fix T47132: Cycles Rendering Tiles Indicator Limited to 16

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

M	source/blender/render/intern/source/external_engine.c

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

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 5abad9e..082c2ac 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -415,15 +415,18 @@ rcti* RE_engine_get_current_tiles(Render *re, int *r_total_tiles, bool *r_needs_
 				/* Just in case we're using crazy network rendering with more
 				 * slaves as BLENDER_MAX_THREADS.
 				 */
-				if (tiles == tiles_static)
-					tiles = MEM_mallocN(allocation_step * sizeof(rcti), "current engine tiles");
-				else
-					tiles = MEM_reallocN(tiles, (total_tiles + allocation_step) * sizeof(rcti));
-
 				allocation_size += allocation_step;
+				if (tiles == tiles_static) {
+					/* Can not realloc yet, tiles are pointing to a
+					 * stack memory.
+					 */
+					tiles = MEM_mallocN(allocation_size * sizeof(rcti), "current engine tiles");
+				}
+				else {
+					tiles = MEM_reallocN(tiles, allocation_size * sizeof(rcti));
+				}
 				*r_needs_free = true;
 			}
-
 			tiles[total_tiles] = pa->disprect;
 
 			if (pa->crop) {




More information about the Bf-blender-cvs mailing list