kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: r_ prefix vs. _r suffix

Browse Source
This commit is contained in:
Sergey Sharybin 2015-03-24 19:20:33 +05:00
parent b714b23443
commit fa09e152af
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/extern/include/RE_engine.h vendored
View File

@ -159,7 +159,7 @@ void RE_engines_exit(void);
RenderEngineType *RE_engines_find(const char *idname); 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); 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); void RE_bake_engine_set_engine_parameters(struct Render *re, struct Main *bmain, struct Scene *scene);

6
source/blender/render/intern/source/external_engine.c
View File

@ -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]; static rcti tiles_static[BLENDER_MAX_THREADS];
const int allocation_step = 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; *r_needs_free = false;
if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) { 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); BLI_rw_mutex_unlock(&re->partsmutex);
return NULL; 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); BLI_rw_mutex_unlock(&re->partsmutex);
*total_tiles_r = total_tiles; *r_total_tiles = total_tiles;
return tiles; return tiles;
} }