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:
authorAntonioya <blendergit@gmail.com>2018-11-04 15:27:41 +0300
committerAntonioya <blendergit@gmail.com>2018-11-04 15:27:41 +0300
commit807b460a11622e75127cabe00c3ff01b1ea6dfcc (patch)
tree8da73ec0917a4778ed832c71e5d6686987eb75c2 /source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
parent5cfcee8c393de6781423c9ef83716c94237fddfd (diff)
GP: Time Offset verify range if loop is disabled
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c')
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
index 8ece1a42c1c..88a5a789466 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
@@ -118,6 +118,17 @@ static int remapTime(
/* apply frame scale */
cfra *= mmd->frame_scale;
+
+ /* verify not outside range if loop is disabled */
+ if ((mmd->flag & GP_TIME_KEEP_LOOP) == 0) {
+ if (cfra + mmd->offset < sfra) {
+ return sfra;
+ }
+ if (cfra + mmd->offset > efra) {
+ return efra;
+ }
+ }
+
if (cfra > efra) {
cfra = sfra + (cfra - ((cfra / efra) * efra));
}