[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49639] branches/soc-2011-tomato: Merging r49635 through r49638 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 49639
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49639
Author:   nazgul
Date:     2012-08-07 07:59:48 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Merging r49635 through r49638 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InpaintNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InpaintNode.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c


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-49634
   + /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-49638


Property changes on: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InpaintNode.cpp
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InpaintNode.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.cpp
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.h
___________________________________________________________________
Added: svn:eol-style
   + native


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-49634
   + /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-49638

Modified: branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c	2012-08-07 01:06:40 UTC (rev 49638)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c	2012-08-07 07:59:48 UTC (rev 49639)
@@ -3291,7 +3291,7 @@
 
 			sub_v2_v2v2(d_xy, coord_array[LINK_ARROW], coord_array[LINK_ARROW - 1]);
 			len = len_v2(d_xy);
-			mul_v2_fl(d_xy, 1.0f / (len * ARROW_SIZE));
+			mul_v2_fl(d_xy, ARROW_SIZE / len);
 			arrow1[0] = coord_array[LINK_ARROW][0] - d_xy[0] + d_xy[1];
 			arrow1[1] = coord_array[LINK_ARROW][1] - d_xy[1] - d_xy[0];
 			arrow2[0] = coord_array[LINK_ARROW][0] - d_xy[0] - d_xy[1];


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-49634
   + /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-49638


Property changes on: branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
___________________________________________________________________
Added: svn:eol-style
   + native