[Bf-blender-cvs] [94ecad5809d] master: Cleanup: Use const variables

Antonio Vazquez noreply at git.blender.org
Mon Sep 16 10:51:39 CEST 2019


Commit: 94ecad5809d00b60835ecec42bbd6a2a251e0760
Author: Antonio Vazquez
Date:   Mon Sep 16 10:48:22 2019 +0200
Branches: master
https://developer.blender.org/rB94ecad5809d00b60835ecec42bbd6a2a251e0760

Cleanup: Use const variables

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
M	source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index b44965707d8..2d1a845330b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -78,15 +78,15 @@ void gpencil_modifier_type_init(GpencilModifierTypeInfo *types[])
 bool is_stroke_affected_by_modifier(Object *ob,
                                     char *mlayername,
                                     char *mmaterialname,
-                                    int mpassindex,
-                                    int gpl_passindex,
-                                    int minpoints,
+                                    const int mpassindex,
+                                    const int gpl_passindex,
+                                    const int minpoints,
                                     bGPDlayer *gpl,
                                     bGPDstroke *gps,
-                                    bool inv1,
-                                    bool inv2,
-                                    bool inv3,
-                                    bool inv4)
+                                    const bool inv1,
+                                    const bool inv2,
+                                    const bool inv3,
+                                    const bool inv4)
 {
   Material *ma = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
   MaterialGPencilStyle *gp_style = ma->gp_style;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
index 7f00e072cda..2b1f8dbc71a 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
@@ -35,15 +35,15 @@ struct bGPDstroke;
 bool is_stroke_affected_by_modifier(struct Object *ob,
                                     char *mlayername,
                                     char *mmaterialname,
-                                    int mpassindex,
-                                    int gpl_passindex,
-                                    int minpoints,
+                                    const int mpassindex,
+                                    const int gpl_passindex,
+                                    const int minpoints,
                                     bGPDlayer *gpl,
                                     bGPDstroke *gps,
-                                    bool inv1,
-                                    bool inv2,
-                                    bool inv3,
-                                    bool inv4);
+                                    const bool inv1,
+                                    const bool inv2,
+                                    const bool inv3,
+                                    const bool inv4);
 
 float get_modifier_point_weight(struct MDeformVert *dvert, bool inverse, int def_nr);
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index 21493ec60c0..ce75ca59fe1 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@ -67,7 +67,7 @@ static void deformStroke(GpencilModifierData *md,
 
   /* It makes sense when adding points to a straight line */
   /* e.g. for creating thickness variation in later modifiers. */
-  int minimum_vert = (mmd->flag | GP_SUBDIV_SIMPLE) ? 2 : 3;
+  const int minimum_vert = (mmd->flag | GP_SUBDIV_SIMPLE) ? 2 : 3;
 
   if (!is_stroke_affected_by_modifier(ob,
                                       mmd->layername,



More information about the Bf-blender-cvs mailing list