sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merging r48538 through r48544 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin 2012-07-03 15:14:14 +00:00
commit 62541003bf
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bl_i18n_utils/bl_process_msg.py
View 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()

4
source/blender/blenkernel/intern/image.c
View 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;
}
}

4
source/blender/editors/space_sequencer/space_sequencer.c
View 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;
}
}