[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48545] branches/soc-2011-tomato: Merging r48538 through r48544 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 48545
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48545
Author:   nazgul
Date:     2012-07-03 15:14:14 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Merging r48538 through r48544 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48538
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48544

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48537
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48544

Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py	2012-07-03 15:06:14 UTC (rev 48544)
+++ branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py	2012-07-03 15:14:14 UTC (rev 48545)
@@ -27,7 +27,7 @@
 # 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()

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-03 15:06:14 UTC (rev 48544)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-03 15:14:14 UTC (rev 48545)
@@ -2847,7 +2847,6 @@
 		/* 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 @@
 			if (framenr == 0) framenr = len;
 		}
 
+		/* important to apply after else we cant loop on frames 100 - 110 for eg. */
+		framenr += iuser->offset;
+
 		return framenr;
 	}
 }


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48537
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48544


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48537
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48544

Modified: branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c	2012-07-03 15:06:14 UTC (rev 48544)
+++ branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c	2012-07-03 15:14:14 UTC (rev 48545)
@@ -454,6 +454,10 @@
 			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;
 	}
 }