Merging r48538 through r48544 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Jul 2012 15:14:14 +0000 (15:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Jul 2012 15:14:14 +0000 (15:14 +0000)
release/scripts/modules/bl_i18n_utils/bl_process_msg.py
source/blender/blenkernel/intern/image.c
source/blender/editors/space_sequencer/space_sequencer.c

index 5c7fc9306f60a3f0dc8a56895faeb6159915fe60..df3a132b91c837b32b7297c86e62bb9fc9b59a66 100644 (file)
@@ -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()
index 733b8bebc9d9850d7f4c05278e1772ac27cc7817..a5e424edbf9d4b70b5c5a17e01fabd5fa6afc5ce 100644 (file)
@@ -2847,7 +2847,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);
@@ -2855,6 +2854,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;
        }
 }
index b8bf764fabccad14912afba8384b3ef8552c5e57..cabc761161e74a1097ad80bcb1ad1dc26a8c46e6 100644 (file)
@@ -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;
        }
 }