From fa09e152afef314e163f502ae1a0f09aaded2e12 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 24 Mar 2015 19:20:33 +0500 Subject: Code cleanup: r_ prefix vs. _r suffix --- source/blender/render/extern/include/RE_engine.h | 2 +- source/blender/render/intern/source/external_engine.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index bc4c4c54f17..a52244ff87f 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -159,7 +159,7 @@ void RE_engines_exit(void); RenderEngineType *RE_engines_find(const char *idname); -rcti* RE_engine_get_current_tiles(struct Render *re, int *total_tiles_r, bool *needs_free_r); +rcti* RE_engine_get_current_tiles(struct Render *re, int *r_total_tiles, bool *r_needs_free); struct RenderData *RE_engine_get_render_data(struct Render *re); void RE_bake_engine_set_engine_parameters(struct Render *re, struct Main *bmain, struct Scene *scene); diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 653f3f0786a..e56466bdf48 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 *r_needs_free) +rcti* RE_engine_get_current_tiles(Render *re, int *r_total_tiles, 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 *r_needs_ *r_needs_free = false; if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) { - *total_tiles_r = 0; + *r_total_tiles = 0; BLI_rw_mutex_unlock(&re->partsmutex); return NULL; } @@ -415,7 +415,7 @@ rcti* RE_engine_get_current_tiles(Render *re, int *total_tiles_r, bool *r_needs_ } } BLI_rw_mutex_unlock(&re->partsmutex); - *total_tiles_r = total_tiles; + *r_total_tiles = total_tiles; return tiles; } -- cgit v1.2.3