From 2e3c474b2d6dbd856b276899930a5f942c49417e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 Jul 2012 14:25:06 +0000 Subject: [PATCH 1/3] image sequence - apply cyclic option AFTER the image offset, there was no way to properly loop on a sequence of images that didnt start frame 1. --- source/blender/blenkernel/intern/image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 65747baa323..d2a2412843a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2829,7 +2829,6 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, shor /* transform to images space */ framenr = (cfra + iuser->fie_ima - 2) / iuser->fie_ima; if (framenr > iuser->frames) framenr = iuser->frames; - framenr += iuser->offset; if (iuser->cycl) { framenr = ((framenr) % len); @@ -2837,6 +2836,9 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, shor if (framenr == 0) framenr = len; } + /* important to apply after else we cant loop on frames 100 - 110 for eg. */ + framenr += iuser->offset; + return framenr; } } From 06b797033a01c28c5b5dc87d2d84cced4a097be0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 3 Jul 2012 15:01:54 +0000 Subject: [PATCH 2/3] Fix #32002: "Anim Player" button on header doesn't appear --- source/blender/editors/space_sequencer/space_sequencer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index b8bf764fabc..cabc761161e 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -454,6 +454,10 @@ static void sequencer_main_area_listener(ARegion *ar, wmNotifier *wmn) if (wmn->action == NA_RENAME) ED_region_tag_redraw(ar); break; + case NC_SCREEN: + if (ELEM(wmn->data, ND_SCREENCAST, ND_ANIMPLAY)) + ED_region_tag_redraw(ar); + break; } } From 8d4f9f9390a55e41a48e57bdead2f15a846a46e5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 3 Jul 2012 15:05:10 +0000 Subject: [PATCH 3/3] Grmph! module renaming broke the tool! --- release/scripts/modules/bl_i18n_utils/bl_process_msg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/modules/bl_i18n_utils/bl_process_msg.py b/release/scripts/modules/bl_i18n_utils/bl_process_msg.py index 5c7fc9306f6..df3a132b91c 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_process_msg.py +++ b/release/scripts/modules/bl_i18n_utils/bl_process_msg.py @@ -27,7 +27,7 @@ import os # Quite an ugly hack… But the simplest solution for now! #import sys #sys.path.append(os.path.abspath(os.path.dirname(__file__))) -import i18n.settings as settings +import bl_i18n_utils.settings as settings #classes = set()