Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-10-17 04:29:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-17 04:29:41 +0300
commitdccf3acede06158742ca9f26838c41da3d0d778e (patch)
tree1579dd8d0fc3577bdc246e16fab32a41ad5aad7f /source/blender/draw
parent0c57373e2c468a8880b1a9f49af7708967e3d546 (diff)
parent3a51b27734b32fd0df8efd243aac8af7ac8a863a (diff)
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 276eb3ceee1..d9ad9bd88d9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -147,7 +147,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;
@@ -169,7 +169,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) {
@@ -180,12 +179,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;
}
}