[Bf-blender-cvs] [3a51b27734b] blender-v2.81-release: Cleanup: shadow warning

Campbell Barton noreply at git.blender.org
Thu Oct 17 03:28:54 CEST 2019


Commit: 3a51b27734b32fd0df8efd243aac8af7ac8a863a
Author: Campbell Barton
Date:   Thu Oct 17 12:19:39 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB3a51b27734b32fd0df8efd243aac8af7ac8a863a

Cleanup: shadow warning

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index f178cd08e31..7b0f0f10705 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -152,7 +152,7 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
 
   const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
 
-  /* Onion skining. */
+  /* Onion skinning. */
   const int step = gpd->gstep;
   const int mode = gpd->onion_mode;
   const short onion_keytype = gpd->onion_keytype;
@@ -174,7 +174,6 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
     int frame_to = 9999;
     if ((is_onion) && (mode == GP_ONION_MODE_RELATIVE)) {
       /* 1) Found first Frame. */
-      int step = gpd->gstep;
       int idx = 0;
       if (gpl->actframe) {
         for (bGPDframe *gf = gpl->actframe->prev; gf; gf = gf->prev) {
@@ -185,12 +184,11 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
           }
         }
         /* 2) Found last Frame. */
-        step = gpd->gstep_next;
         idx = 0;
         for (bGPDframe *gf = gpl->actframe->next; gf; gf = gf->next) {
           idx++;
           frame_to = gf->framenum;
-          if (idx >= step) {
+          if (idx >= gpd->gstep_next) {
             break;
           }
         }



More information about the Bf-blender-cvs mailing list