[Bf-blender-cvs] [2cc47474434] master: Cleanup: Clang tidy

[Hans Goudey]

Commit: 2cc47474434aaf7756ef5cfc7fcd099e179c0fd3
Author: Hans Goudey
Date:   Thu Feb 10 15:53:37 2022 -0600
Branches: master
https://developer.blender.org/rB2cc47474434aaf7756ef5cfc7fcd099e179c0fd3

Cleanup: Clang tidy

Mismatched parameter names and else after return.

===================================================================

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index fd8996993c0..7c627ea6664 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -195,8 +195,8 @@ void BKE_gpencil_frame_copy_settings(const struct bGPDframe *gpf_src, struct bGP
 /**
  * Make a copy of a given gpencil stroke settings.
  */
-void BKE_gpencil_stroke_copy_settings(const struct bGPDstroke *gpf_src,
-                                      struct bGPDstroke *gpf_dst);
+void BKE_gpencil_stroke_copy_settings(const struct bGPDstroke *gps_src,
+                                      struct bGPDstroke *gps_dst);
 
 /**
  * Make a copy of strokes between gpencil frames.
@@ -741,7 +741,8 @@ int BKE_gpencil_material_find_index_by_name_prefix(struct Object *ob, const char
 
 void BKE_gpencil_blend_read_data(struct BlendDataReader *reader, struct bGPdata *gpd);
 
-bool BKE_gpencil_can_avoid_full_copy_on_write(const struct Depsgraph *depsgraph, struct bGPdata *gpd);
+bool BKE_gpencil_can_avoid_full_copy_on_write(const struct Depsgraph *depsgraph,
+                                              struct bGPdata *gpd);
 
 void BKE_gpencil_update_on_write(struct bGPdata *gpd_orig, struct bGPdata *gpd_eval);
 
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 6e39125b252..cb18c28b3dc 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2879,7 +2879,7 @@ static bool gpencil_update_on_write_layer_cb(GPencilUpdateCache *gpl_cache, void
     td->gpl_eval->runtime.gpl_orig = gpl;
     return true;
   }
-  else if (gpl_cache->flag == GP_UPDATE_NODE_LIGHT_COPY) {
+  if (gpl_cache->flag == GP_UPDATE_NODE_LIGHT_COPY) {
     BLI_assert(gpl != NULL);
     BKE_gpencil_layer_copy_settings(gpl, td->gpl_eval);
     td->gpl_eval->runtime.gpl_orig = gpl;
@@ -2919,7 +2919,7 @@ static bool gpencil_update_on_write_frame_cb(GPencilUpdateCache *gpf_cache, void
 
     return true;
   }
-  else if (gpf_cache->flag == GP_UPDATE_NODE_LIGHT_COPY) {
+  if (gpf_cache->flag == GP_UPDATE_NODE_LIGHT_COPY) {
     BLI_assert(gpf != NULL);
     BKE_gpencil_frame_copy_settings(gpf, td->gpf_eval);
     td->gpf_eval->runtime.gpf_orig = gpf;