[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40601] branches/soc-2011-tomato: Merging r40598 through r40600 from trunk into soc-2011-tomato

Sergey Sharybin g.ulairi at gmail.com
Tue Sep 27 12:03:26 CEST 2011


Revision: 40601
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40601
Author:   nazgul
Date:     2011-09-27 10:03:26 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merging r40598 through r40600 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/po/update_msg.py
    branches/soc-2011-tomato/source/blender/editors/mesh/SConscript

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


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40597
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40600

Modified: branches/soc-2011-tomato/po/update_msg.py
===================================================================
--- branches/soc-2011-tomato/po/update_msg.py	2011-09-27 09:43:35 UTC (rev 40600)
+++ branches/soc-2011-tomato/po/update_msg.py	2011-09-27 10:03:26 UTC (rev 40601)
@@ -80,7 +80,7 @@
     for cls in bpy.types.Operator.__subclasses__():
         walkClass(cls)
 
-    from bl_ui.space_userpref_keymap import KM_HIERARCHY
+    from bpy_extras.keyconfig_utils import KM_HIERARCHY
 
     walk_keymap_hierarchy(KM_HIERARCHY)
 

Modified: branches/soc-2011-tomato/source/blender/editors/mesh/SConscript
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/SConscript	2011-09-27 09:43:35 UTC (rev 40600)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/SConscript	2011-09-27 10:03:26 UTC (rev 40601)
@@ -3,6 +3,8 @@
 
 sources = env.Glob('*.c')
 
+defs = []
+
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../gpu ../../blenloader'
@@ -21,4 +23,4 @@
 else:
     sources.remove('mesh_navmesh.c')
 
-env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), [], libtype=['core'], priority=[45] )
+env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), defs, libtype=['core'], priority=[45] )


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40597
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40600




More information about the Bf-blender-cvs mailing list