[Bf-blender-cvs] [1bcec529919] master: Cleanup: More clear naming for rendering functions
Sergey Sharybin
noreply at git.blender.org
Tue May 7 11:13:10 CEST 2019
Commit: 1bcec5299193738fcb62211977d44597fea3be17
Author: Sergey Sharybin
Date: Mon May 6 17:36:34 2019 +0200
Branches: master
https://developer.blender.org/rB1bcec5299193738fcb62211977d44597fea3be17
Cleanup: More clear naming for rendering functions
===================================================================
M source/blender/blenkernel/intern/sequencer.c
M source/blender/editors/render/render_internal.c
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/source/pipeline.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 74541c13c4f..98de4ab39fc 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -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;
}
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 09bcc0a3058..1e85c895f71 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -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);
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 46d2df0acb5..805235e6c6a 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -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,
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 7d3002ea71d..981a305e443 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -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;
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index e15a1f3e258..ef6b7de3027 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -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();
More information about the Bf-blender-cvs
mailing list