From 1bcec5299193738fcb62211977d44597fea3be17 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 6 May 2019 17:36:34 +0200
Subject: Cleanup: More clear naming for rendering functions

---
 source/blender/editors/render/render_internal.c | 49 ++++++++++++-------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'source/blender/editors/render/render_internal.c')

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);
 
-- 
cgit v1.2.3