[Bf-blender-cvs] [f0e7fd4ad62] master: GPencil: Fix unreported error when frame is zero in Time modifier
Antonio Vazquez
noreply at git.blender.org
Sat Nov 30 17:09:24 CET 2019
Commit: f0e7fd4ad62ec1dd5c9632050a8fde347c28656f
Author: Antonio Vazquez
Date: Sat Nov 30 17:05:08 2019 +0100
Branches: master
https://developer.blender.org/rBf0e7fd4ad62ec1dd5c9632050a8fde347c28656f
GPencil: Fix unreported error when frame is zero in Time modifier
When the frame was zero, the frame number was clamped by error to 1.
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
index 01bb0ae2b93..e3ad5a64ac3 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
@@ -71,8 +71,14 @@ static int remapTime(struct GpencilModifierData *md,
const bool invpass = mmd->flag & GP_TIME_INVERT_LAYERPASS;
int sfra = custom ? mmd->sfra : scene->r.sfra;
int efra = custom ? mmd->efra : scene->r.efra;
- CLAMP_MIN(sfra, 1);
- CLAMP_MIN(efra, 1);
+ CLAMP_MIN(sfra, 0);
+ CLAMP_MIN(efra, 0);
+
+ /* Avoid inverse ranges. */
+ if (efra < sfra) {
+ return cfra;
+ }
+
const int time_range = efra - sfra + 1;
int offset = mmd->offset;
int segments = 0;
More information about the Bf-blender-cvs
mailing list