blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: More clear naming for rendering functions

This commit is contained in:
Sergey Sharybin 2019-05-06 17:36:34 +02:00
parent 036e95bb21
commit 1bcec52991
5 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/sequencer.c
View File

@ -3572,9 +3572,9 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context,
re = RE_NewSceneRender(scene);
}
RE_BlenderFrame(re, context->bmain, scene, view_layer, camera, frame, false);
RE_RenderFrame(re, context->bmain, scene, view_layer, camera, frame, false);
/* restore previous state after it was toggled on & off by RE_BlenderFrame */
/* restore previous state after it was toggled on & off by RE_RenderFrame */
G.is_rendering = is_rendering;
}

49
source/blender/editors/render/render_internal.c
View File

@ -356,7 +356,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
/* cleanup sequencer caches before starting user triggered render.
* otherwise, invalidated cache entries can make their way into
* the output rendering. We can't put that into RE_BlenderFrame,
* the output rendering. We can't put that into RE_RenderFrame,
* since sequence rendering can call that recursively... (peter) */
BKE_sequencer_cache_cleanup(scene);
@ -364,18 +364,17 @@ static int screen_render_exec(bContext *C, wmOperator *op)
BLI_threaded_malloc_begin();
if (is_animation) {
RE_BlenderAnim(re,
mainp,
scene,
single_layer,
camera_override,
scene->r.sfra,
scene->r.efra,
scene->r.frame_step);
RE_RenderAnim(re,
mainp,
scene,
single_layer,
camera_override,
scene->r.sfra,
scene->r.efra,
scene->r.frame_step);
}
else {
RE_BlenderFrame(
re, mainp, scene, single_layer, camera_override, scene->r.cfra, is_write_still);
RE_RenderFrame(re, mainp, scene, single_layer, camera_override, scene->r.cfra, is_write_still);
}
BLI_threaded_malloc_end();
@ -671,23 +670,23 @@ static void render_startjob(void *rjv, short *stop, short *do_update, float *pro
RE_SetReports(rj->re, rj->reports);
if (rj->anim) {
RE_BlenderAnim(rj->re,
RE_RenderAnim(rj->re,
rj->main,
rj->scene,
rj->single_layer,
rj->camera_override,
rj->scene->r.sfra,
rj->scene->r.efra,
rj->scene->r.frame_step);
}
else {
RE_RenderFrame(rj->re,
rj->main,
rj->scene,
rj->single_layer,
rj->camera_override,
rj->scene->r.sfra,
rj->scene->r.efra,
rj->scene->r.frame_step);
}
else {
RE_BlenderFrame(rj->re,
rj->main,
rj->scene,
rj->single_layer,
rj->camera_override,
rj->scene->r.cfra,
rj->write_still);
rj->scene->r.cfra,
rj->write_still);
}
RE_SetReports(rj->re, NULL);
@ -976,7 +975,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
/* cleanup sequencer caches before starting user triggered render.
* otherwise, invalidated cache entries can make their way into
* the output rendering. We can't put that into RE_BlenderFrame,
* the output rendering. We can't put that into RE_RenderFrame,
* since sequence rendering can call that recursively... (peter) */
BKE_sequencer_cache_cleanup(scene);

22
source/blender/render/extern/include/RE_pipeline.h vendored
View File

@ -284,21 +284,21 @@ bool RE_WriteRenderViewsMovie(struct ReportList *reports,
bool preview);
/* only RE_NewRender() needed, main Blender render calls */
void RE_BlenderFrame(struct Render *re,
struct Main *bmain,
struct Scene *scene,
struct ViewLayer *single_layer,
struct Object *camera_override,
int frame,
const bool write_still);
void RE_BlenderAnim(struct Render *re,
void RE_RenderFrame(struct Render *re,
struct Main *bmain,
struct Scene *scene,
struct ViewLayer *single_layer,
struct Object *camera_override,
int sfra,
int efra,
int tfra);
int frame,
const bool write_still);
void RE_RenderAnim(struct Render *re,
struct Main *bmain,
struct Scene *scene,
struct ViewLayer *single_layer,
struct Object *camera_override,
int sfra,
int efra,
int tfra);
#ifdef WITH_FREESTYLE
void RE_RenderFreestyleStrokes(struct Render *re,
struct Main *bmain,

30
source/blender/render/intern/source/pipeline.c
View File

@ -2072,13 +2072,13 @@ void RE_SetReports(Render *re, ReportList *reports)
}
/* general Blender frame render call */
void RE_BlenderFrame(Render *re,
Main *bmain,
Scene *scene,
ViewLayer *single_layer,
Object *camera_override,
int frame,
const bool write_still)
void RE_RenderFrame(Render *re,
Main *bmain,
Scene *scene,
ViewLayer *single_layer,
Object *camera_override,
int frame,
const bool write_still)
{
BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_INIT);
@ -2461,14 +2461,14 @@ static void re_movie_free_all(Render *re, bMovieHandle *mh, int totvideos)
}
/* saves images to disk */
void RE_BlenderAnim(Render *re,
Main *bmain,
Scene *scene,
ViewLayer *single_layer,
Object *camera_override,
int sfra,
int efra,
int tfra)
void RE_RenderAnim(Render *re,
Main *bmain,
Scene *scene,
ViewLayer *single_layer,
Object *camera_override,
int sfra,
int efra,
int tfra)
{
RenderData rd = scene->r;
bMovieHandle *mh = NULL;

5
source/creator/creator_args.c
View File

@ -1520,7 +1520,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
}
for (int frame = frame_range_arr[i][0]; frame <= frame_range_arr[i][1]; frame++) {
RE_BlenderAnim(re, bmain, scene, NULL, NULL, frame, frame, scene->r.frame_step);
RE_RenderAnim(re, bmain, scene, NULL, NULL, frame, frame, scene->r.frame_step);
}
}
RE_SetReports(re, NULL);
@ -1553,8 +1553,7 @@ static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(arg
BLI_threaded_malloc_begin();
BKE_reports_init(&reports, RPT_STORE);
RE_SetReports(re, &reports);
RE_BlenderAnim(
re, bmain, scene, NULL, NULL, scene->r.sfra, scene->r.efra, scene->r.frame_step);
RE_RenderAnim(re, bmain, scene, NULL, NULL, scene->r.sfra, scene->r.efra, scene->r.frame_step);
RE_SetReports(re, NULL);
BKE_reports_clear(&reports);
BLI_threaded_malloc_end();