[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52851] tags/blender-2.65-release/blender: Merging r52848 through r52850 from trunk into blender-2.65-release

[Sergey Sharybin]

Revision: 52851
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52851
Author:   nazgul
Date:     2012-12-10 14:09:31 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Merging r52848 through r52850 from trunk into blender-2.65-release

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

Modified Paths:
--------------
    tags/blender-2.65-release/blender/release/scripts/presets/keyconfig/maya.py
    tags/blender-2.65-release/blender/source/tools/tag_release.py

Property Changed:
----------------
    tags/blender-2.65-release/blender/
    tags/blender-2.65-release/blender/source/blender/editors/interface/interface.c
    tags/blender-2.65-release/blender/source/blender/editors/space_outliner/


Property changes on: tags/blender-2.65-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:52842-52847
   + /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:52842-52850

Modified: tags/blender-2.65-release/blender/release/scripts/presets/keyconfig/maya.py
===================================================================
--- tags/blender-2.65-release/blender/release/scripts/presets/keyconfig/maya.py	2012-12-10 14:06:57 UTC (rev 52850)
+++ tags/blender-2.65-release/blender/release/scripts/presets/keyconfig/maya.py	2012-12-10 14:09:31 UTC (rev 52851)
@@ -366,7 +366,7 @@
 kmi = km.keymap_items.new('mesh.dupli_extrude_cursor', 'ACTIONMOUSE', 'CLICK', ctrl=True)
 kmi = km.keymap_items.new('mesh.delete', 'X', 'PRESS')
 kmi = km.keymap_items.new('mesh.delete', 'DEL', 'PRESS')
-kmi = km.keymap_items.new('mesh.knifetool', 'LEFTMOUSE', 'PRESS', key_modifier='K')
+kmi = km.keymap_items.new('mesh.knife_tool', 'LEFTMOUSE', 'PRESS', key_modifier='K')
 # BMESH_TODO: midpoints for knife were moved to modal keymap
 #kmi = km.keymap_items.new('mesh.knifetool', 'LEFTMOUSE', 'PRESS', shift=True, key_modifier='K')
 #kmi.properties.type = 'MIDPOINTS'


Property changes on: tags/blender-2.65-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:52842-52847
   + /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:52842-52850


Property changes on: tags/blender-2.65-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:52842-52847
   + /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:52842-52850

Modified: tags/blender-2.65-release/blender/source/tools/tag_release.py
===================================================================
--- tags/blender-2.65-release/blender/source/tools/tag_release.py	2012-12-10 14:06:57 UTC (rev 52850)
+++ tags/blender-2.65-release/blender/source/tools/tag_release.py	2012-12-10 14:09:31 UTC (rev 52851)
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-REV_BLENDER = 51016
-REV_EXTENSIONS = 3805
-REV_LOCALE = 1097
+REV_BLENDER = 52841
+REV_EXTENSIONS = 4033
+REV_LOCALE = 1276
 
-TAG_BLENDER = "blender-2.64-release"
-TAG_EXTENSIONS = TAG_LOCALE = "2_64_release"
+TAG_BLENDER = "blender-2.65-release"
+TAG_EXTENSIONS = TAG_LOCALE = "2_65_release"
 
 print("\n# Run these commands from the blender source dir:")