[Bf-blender-cvs] [94a3924] master: Correct recent commit

Campbell Barton noreply at git.blender.org
Fri Mar 20 16:26:00 CET 2015


Commit: 94a3924eab251c7e487c9f2b631e55e9c6ebf2e9
Author: Campbell Barton
Date:   Sat Mar 21 02:25:28 2015 +1100
Branches: master
https://developer.blender.org/rB94a3924eab251c7e487c9f2b631e55e9c6ebf2e9

Correct recent commit

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

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 d5f1cab..c66b9c2 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -368,7 +368,7 @@ void RE_engine_set_error_message(RenderEngine *engine, const char *msg)
 	}
 }
 
-rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *needs_free_r)
+rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *r_needs_free)
 {
 	static rcti tiles_static[BLENDER_MAX_THREADS];
 	const int allocation_step = BLENDER_MAX_THREADS;
@@ -382,7 +382,7 @@ rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *needs_fr
 	if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) {
 		*total_tiles_r = 0;
 		BLI_rw_mutex_unlock(&re->partsmutex);
-		needs_free_r = false;
+		*r_needs_free = false;
 		return NULL;
 	}




More information about the Bf-blender-cvs mailing list