Revision: 50226
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50226
Author: nazgul
Date: 2012-08-26 16:43:24 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Merging r50224 through r50225 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50224
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50225
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.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-50223
+
/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-50225
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-50223
+ /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-50225
Modified: branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
2012-08-26 16:41:03 UTC (rev 50225)
+++ branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
2012-08-26 16:43:24 UTC (rev 50226)
@@ -682,7 +682,10 @@
/* default not to zoom the sequencer vertically */
if (sa && sa->spacetype == SPACE_SEQ) {
- do_zoom_y = FALSE;
+ ARegion *ar = CTX_wm_region(C);
+
+ if (ar && ar->regiontype != RGN_TYPE_PREVIEW)
+ do_zoom_y = FALSE;
}
/* set RNA-Props - zooming in by uniform factor */
@@ -727,7 +730,7 @@
/* api callbacks */
ot->invoke = view_zoomin_invoke;
-// ot->exec = view_zoomin_exec; // XXX, needs view_zoomdrag_init called
first.
+ ot->exec = view_zoomin_exec; // XXX, needs view_zoomdrag_init called
first.
ot->poll = view_zoom_poll;
/* rna - must keep these in sync with the other operators */
@@ -748,7 +751,10 @@
/* default not to zoom the sequencer vertically */
if (sa && sa->spacetype == SPACE_SEQ) {
- do_zoom_y = FALSE;
+ ARegion *ar = CTX_wm_region(C);
+
+ if (ar && ar->regiontype != RGN_TYPE_PREVIEW)
+ do_zoom_y = FALSE;
}
/* set RNA-Props - zooming in by uniform factor */
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-50223
+
/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-50225
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
