Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix

No functional changes

6 files changed, 49 insertions, 49 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index c8cb537af39..089c7eb044b 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -251,8 +251,8 @@ void RE_ChangeModeFlag(struct Render *re, int flag, bool clear);
 
 /* set up the viewplane/perspective matrix, three choices */
 struct Object *RE_GetCamera(struct Render *re); /* return camera override if set */
-void RE_SetOverrideCamera(struct Render *re, struct Object *camera);
-void RE_SetCamera(struct Render *re, struct Object *camera);
+void RE_SetOverrideCamera(struct Render *re, struct Object *cam_ob);
+void RE_SetCamera(struct Render *re, struct Object *cam_ob);
 void RE_SetWindow(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
 void RE_SetOrtho(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
 
@@ -383,8 +383,8 @@ bool RE_allow_render_generic_object(struct Object *ob);
 bool RE_HasCombinedLayer(RenderResult *res);
 bool RE_HasFloatPixels(RenderResult *res);
 bool RE_RenderResult_is_stereo(RenderResult *res);
-struct RenderView *RE_RenderViewGetById(struct RenderResult *res, const int view_id);
-struct RenderView *RE_RenderViewGetByName(struct RenderResult *res, const char *viewname);
+struct RenderView *RE_RenderViewGetById(struct RenderResult *rr, const int view_id);
+struct RenderView *RE_RenderViewGetByName(struct RenderResult *rr, const char *viewname);
 
 RenderResult *RE_DuplicateRenderResult(RenderResult *rr);
 
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 187685cd464..5c487223e94 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -92,7 +92,7 @@ struct RenderPass *render_layer_add_pass(struct RenderResult *rr,
                                          int channels,
                                          const char *name,
                                          const char *viewname,
-                                         const char *chanid);
+                                         const char *chan_id);
 
 void render_result_exr_file_merge(struct RenderResult *rr,
                                   struct RenderResult *rrpart,
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index b898ff89ae4..41fa15c594f 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -36,7 +36,7 @@ typedef struct ZSpan {
 void zbuf_alloc_span(struct ZSpan *zspan, int rectx, int recty);
 void zbuf_free_span(struct ZSpan *zspan);
 
-void zspan_scanconvert(struct ZSpan *zpan,
+void zspan_scanconvert(struct ZSpan *zspan,
                        void *handle,
                        float *v1,
                        float *v2,
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index d631dd1a2ff..d1632dfeacd 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -182,9 +182,9 @@ static void re_camera_params_get(Render *re, CameraParams *params)
   re->viewplane = params->viewplane;
 }
 
-void RE_SetOverrideCamera(Render *re, Object *camera)
+void RE_SetOverrideCamera(Render *re, Object *cam_ob)
 {
-  re->camera_override = camera;
+  re->camera_override = cam_ob;
 }
 
 static void re_camera_params_stereo3d(Render *re, CameraParams *params, Object *cam_ob)
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 41d20fa994a..8c61fd5b971 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -265,9 +265,9 @@ static int render_imbuf_write_stamp_test(ReportList *reports,
   return ok;
 }
 
-void RE_FreeRenderResult(RenderResult *res)
+void RE_FreeRenderResult(RenderResult *rr)
 {
-  render_result_free(res);
+  render_result_free(rr);
 }
 
 float *RE_RenderLayerGetPass(volatile RenderLayer *rl, const char *name, const char *viewname)
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index ef44c896a25..ef88584974a 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -58,11 +58,11 @@
 
 /********************************** Free *************************************/
 
-static void render_result_views_free(RenderResult *res)
+static void render_result_views_free(RenderResult *rr)
 {
-  while (res->views.first) {
-    RenderView *rv = res->views.first;
-    BLI_remlink(&res->views, rv);
+  while (rr->views.first) {
+    RenderView *rv = rr->views.first;
+    BLI_remlink(&rr->views, rv);
 
     if (rv->rect32) {
       MEM_freeN(rv->rect32);
@@ -79,17 +79,17 @@ static void render_result_views_free(RenderResult *res)
     MEM_freeN(rv);
   }
 
-  res->have_combined = false;
+  rr->have_combined = false;
 }
 
-void render_result_free(RenderResult *res)
+void render_result_free(RenderResult *rr)
 {
-  if (res == NULL) {
+  if (rr == NULL) {
     return;
   }
 
-  while (res->layers.first) {
-    RenderLayer *rl = res->layers.first;
+  while (rr->layers.first) {
+    RenderLayer *rl = rr->layers.first;
 
     while (rl->passes.first) {
       RenderPass *rpass = rl->passes.first;
@@ -99,31 +99,31 @@ void render_result_free(RenderResult *res)
       BLI_remlink(&rl->passes, rpass);
       MEM_freeN(rpass);
     }
-    BLI_remlink(&res->layers, rl);
+    BLI_remlink(&rr->layers, rl);
     MEM_freeN(rl);
   }
 
-  render_result_views_free(res);
+  render_result_views_free(rr);
 
-  if (res->rect32) {
-    MEM_freeN(res->rect32);
+  if (rr->rect32) {
+    MEM_freeN(rr->rect32);
   }
-  if (res->rectz) {
-    MEM_freeN(res->rectz);
+  if (rr->rectz) {
+    MEM_freeN(rr->rectz);
   }
-  if (res->rectf) {
-    MEM_freeN(res->rectf);
+  if (rr->rectf) {
+    MEM_freeN(rr->rectf);
   }
-  if (res->text) {
-    MEM_freeN(res->text);
+  if (rr->text) {
+    MEM_freeN(rr->text);
   }
-  if (res->error) {
-    MEM_freeN(res->error);
+  if (rr->error) {
+    MEM_freeN(rr->error);
   }
 
-  BKE_stamp_data_free(res->stamp_data);
+  BKE_stamp_data_free(rr->stamp_data);
 
-  MEM_freeN(res);
+  MEM_freeN(rr);
 }
 
 /* version that's compatible with fullsample buffers */
@@ -1576,15 +1576,15 @@ void render_result_rect_get_pixels(RenderResult *rr,
 
 /*************************** multiview functions *****************************/
 
-bool RE_HasCombinedLayer(RenderResult *res)
+bool RE_HasCombinedLayer(RenderResult *rr)
 {
   RenderView *rv;
 
-  if (res == NULL) {
+  if (rr == NULL) {
     return false;
   }
 
-  rv = res->views.first;
+  rv = rr->views.first;
   if (rv == NULL) {
     return false;
   }
@@ -1592,11 +1592,11 @@ bool RE_HasCombinedLayer(RenderResult *res)
   return (rv->rect32 || rv->rectf);
 }
 
-bool RE_HasFloatPixels(RenderResult *res)
+bool RE_HasFloatPixels(RenderResult *rr)
 {
   RenderView *rview;
 
-  for (rview = res->views.first; rview; rview = rview->next) {
+  for (rview = rr->views.first; rview; rview = rview->next) {
     if (rview->rect32 && !rview->rectf) {
       return false;
     }
@@ -1605,31 +1605,31 @@ bool RE_HasFloatPixels(RenderResult *res)
   return true;
 }
 
-bool RE_RenderResult_is_stereo(RenderResult *res)
+bool RE_RenderResult_is_stereo(RenderResult *rr)
 {
-  if (!BLI_findstring(&res->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) {
+  if (!BLI_findstring(&rr->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) {
     return false;
   }
 
-  if (!BLI_findstring(&res->views, STEREO_RIGHT_NAME, offsetof(RenderView, name))) {
+  if (!BLI_findstring(&rr->views, STEREO_RIGHT_NAME, offsetof(RenderView, name))) {
     return false;
   }
 
   return true;
 }
 
-RenderView *RE_RenderViewGetById(RenderResult *res, const int view_id)
+RenderView *RE_RenderViewGetById(RenderResult *rr, const int view_id)
 {
-  RenderView *rv = BLI_findlink(&res->views, view_id);
-  BLI_assert(res->views.first);
-  return rv ? rv : res->views.first;
+  RenderView *rv = BLI_findlink(&rr->views, view_id);
+  BLI_assert(rr->views.first);
+  return rv ? rv : rr->views.first;
 }
 
-RenderView *RE_RenderViewGetByName(RenderResult *res, const char *viewname)
+RenderView *RE_RenderViewGetByName(RenderResult *rr, const char *viewname)
 {
-  RenderView *rv = BLI_findstring(&res->views, viewname, offsetof(RenderView, name));
-  BLI_assert(res->views.first);
-  return rv ? rv : res->views.first;
+  RenderView *rv = BLI_findstring(&rr->views, viewname, offsetof(RenderView, name));
+  BLI_assert(rr->views.first);
+  return rv ? rv : rr->views.first;
 }
 
 static RenderPass *duplicate_render_pass(RenderPass *rpass)