[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51210] tags/blender-2.64a-release/blender : Merge commit 51209 from trunk into 2.64a tag
Sergey Sharybin
sergey.vfx at gmail.com
Tue Oct 9 11:42:20 CEST 2012
Revision: 51210
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51210
Author: nazgul
Date: 2012-10-09 09:42:18 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Merge commit 51209 from trunk into 2.64a tag
Modified Paths:
--------------
tags/blender-2.64a-release/blender/source/blender/editors/interface/view2d_ops.c
Property Changed:
----------------
tags/blender-2.64a-release/blender/
tags/blender-2.64a-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.64a-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.64a-release/blender
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51176,51181,51184-51186,51191
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51176,51181,51184-51186,51191,51209
Property changes on: tags/blender-2.64a-release/blender/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/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191
+ /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/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209
Modified: tags/blender-2.64a-release/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/editors/interface/view2d_ops.c 2012-10-09 09:38:05 UTC (rev 51209)
+++ tags/blender-2.64a-release/blender/source/blender/editors/interface/view2d_ops.c 2012-10-09 09:42:18 UTC (rev 51210)
@@ -941,10 +941,15 @@
/* As we have only 1D information (magnify value), feed both axes
* with magnify information that is stored in x axis
*/
- fac = 0.01f * (event->x - event->prevx);
+ fac = 0.01f * (event->prevx - event->x);
dx = fac * BLI_rctf_size_x(&v2d->cur) / 10.0f;
dy = fac * BLI_rctf_size_y(&v2d->cur) / 10.0f;
+ if (U.uiflag & USER_ZOOM_INVERT) {
+ dx *= -1;
+ dy *= -1;
+ }
+
RNA_float_set(op->ptr, "deltax", dx);
RNA_float_set(op->ptr, "deltay", dy);
Property changes on: tags/blender-2.64a-release/blender/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
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender/source/blender/editors/space_outliner:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191
+ /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
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender/source/blender/editors/space_outliner:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209
More information about the Bf-blender-cvs
mailing list