[Bf-blender-cvs] [8ff4c53] master: Correction to previous commit, initialization of needs_free got lost by accident
Sergey Sharybin
noreply at git.blender.org
Fri Mar 20 17:10:11 CET 2015
Commit: 8ff4c53e63dc1eb7f4855915dd45d044b854e301
Author: Sergey Sharybin
Date: Fri Mar 20 21:09:52 2015 +0500
Branches: master
https://developer.blender.org/rB8ff4c53e63dc1eb7f4855915dd45d044b854e301
Correction to previous commit, initialization of needs_free got lost by accident
===================================================================
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 c66b9c2..653f3f0 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -379,10 +379,11 @@ rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *r_needs_
BLI_rw_mutex_lock(&re->partsmutex, THREAD_LOCK_READ);
+ *r_needs_free = false;
+
if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) {
*total_tiles_r = 0;
BLI_rw_mutex_unlock(&re->partsmutex);
- *r_needs_free = false;
return NULL;
}
@@ -398,6 +399,7 @@ rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *r_needs_
tiles = MEM_reallocN(tiles, (total_tiles + allocation_step) * sizeof(rcti));
allocation_size += allocation_step;
+ *r_needs_free = true;
}
tiles[total_tiles] = pa->disprect;
More information about the Bf-blender-cvs
mailing list