[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43483] branches/bmesh/blender: svn merge ^/trunk/blender -r43472:43482

Campbell Barton ideasman42 at gmail.com
Wed Jan 18 08:04:24 CET 2012


Revision: 43483
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43483
Author:   campbellbarton
Date:     2012-01-18 07:04:17 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43472:43482

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

Modified Paths:
--------------
    branches/bmesh/blender/build_files/cmake/project_info.py
    branches/bmesh/blender/build_files/cmake/project_source_info.py
    branches/bmesh/blender/extern/carve/bundle.sh
    branches/bmesh/blender/extern/carve/patches/series
    branches/bmesh/blender/release/scripts/modules/addon_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy/utils.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c

Added Paths:
-----------
    branches/bmesh/blender/extern/carve/patches/gcc46.patch
    branches/bmesh/blender/extern/carve/patches/mingw.patch
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_paint_common.py

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39992-43472
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39992-43482

Modified: branches/bmesh/blender/build_files/cmake/project_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_info.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/build_files/cmake/project_info.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -133,7 +133,7 @@
     """ Extracr includes and defines from cmake.
     """
 
-    def create_eclipse_project(CMAKE_DIR):
+    def create_eclipse_project():
         print("CMAKE_DIR %r" % CMAKE_DIR)
         if sys.platform == "win32":
             cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
@@ -145,7 +145,7 @@
     includes = []
     defines = []
 
-    create_eclipse_project(CMAKE_DIR)
+    create_eclipse_project()
 
     from xml.dom.minidom import parse
     tree = parse(join(CMAKE_DIR, ".cproject"))

Modified: branches/bmesh/blender/build_files/cmake/project_source_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_source_info.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/build_files/cmake/project_source_info.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -160,7 +160,6 @@
 def queue_processes(process_funcs, job_total=-1):
     """ Takes a list of function arg pairs, each function must return a process
     """
-    import sys
 
     if job_total == -1:
         import multiprocessing

Modified: branches/bmesh/blender/extern/carve/bundle.sh
===================================================================
--- branches/bmesh/blender/extern/carve/bundle.sh	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/extern/carve/bundle.sh	2012-01-18 07:04:17 UTC (rev 43483)
@@ -114,7 +114,8 @@
 if env['WITH_BF_BOOST']:
     if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
         # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-        defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+        if env['OURPLATFORM'] != 'win32-mingw':
+            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
     defs.append('CARVE_SYSTEM_BOOST')
     incs.append(env['BF_BOOST_INC'])

Copied: branches/bmesh/blender/extern/carve/patches/gcc46.patch (from rev 43482, trunk/blender/extern/carve/patches/gcc46.patch)
===================================================================
--- branches/bmesh/blender/extern/carve/patches/gcc46.patch	                        (rev 0)
+++ branches/bmesh/blender/extern/carve/patches/gcc46.patch	2012-01-18 07:04:17 UTC (rev 43483)
@@ -0,0 +1,11 @@
+diff -r 525472fb477a include/carve/polyline_iter.hpp
+--- a/include/carve/polyline_iter.hpp	Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/polyline_iter.hpp	Wed Jan 18 00:41:13 2012 +0600
+@@ -20,6 +20,7 @@
+ #include <list>
+ #include <iterator>
+ #include <limits>
++#include <cstddef>
+ 
+ #include <carve/polyline_decl.hpp>
+ 

Copied: branches/bmesh/blender/extern/carve/patches/mingw.patch (from rev 43482, trunk/blender/extern/carve/patches/mingw.patch)
===================================================================
--- branches/bmesh/blender/extern/carve/patches/mingw.patch	                        (rev 0)
+++ branches/bmesh/blender/extern/carve/patches/mingw.patch	2012-01-18 07:04:17 UTC (rev 43483)
@@ -0,0 +1,15 @@
+diff -r 525472fb477a include/carve/win32.h
+--- a/include/carve/win32.h	Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/win32.h	Wed Jan 18 00:40:10 2012 +0600
+@@ -8,9 +8,11 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
++#if !defined(__MINGW32__)
+ inline int strcasecmp(const char *a, const char *b) {
+   return _stricmp(a,b);
+ }
++#endif
+ 
+ inline void srandom(unsigned long input) {
+   srand(input);

Modified: branches/bmesh/blender/extern/carve/patches/series
===================================================================
--- branches/bmesh/blender/extern/carve/patches/series	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/extern/carve/patches/series	2012-01-18 07:04:17 UTC (rev 43483)
@@ -2,3 +2,5 @@
 includes.patch
 win32.patch
 mesh_iterator.patch
+mingw.patch
+gcc46.patch


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43472
   + /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43482

Modified: branches/bmesh/blender/release/scripts/modules/addon_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/addon_utils.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/release/scripts/modules/addon_utils.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -38,17 +38,17 @@
 
 def paths():
     # RELEASE SCRIPTS: official scripts distributed in Blender releases
-    paths = _bpy.utils.script_paths("addons")
+    addon_paths = _bpy.utils.script_paths("addons")
 
     # CONTRIB SCRIPTS: good for testing but not official scripts yet
     # if folder addons_contrib/ exists, scripts in there will be loaded too
-    paths += _bpy.utils.script_paths("addons_contrib")
+    addon_paths += _bpy.utils.script_paths("addons_contrib")
 
     # EXTERN SCRIPTS: external projects scripts
     # if folder addons_extern/ exists, scripts in there will be loaded too
-    paths += _bpy.utils.script_paths("addons_extern")
+    addon_paths += _bpy.utils.script_paths("addons_extern")
 
-    return paths
+    return addon_paths
 
 
 def modules(module_cache):

Modified: branches/bmesh/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy/utils.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/release/scripts/modules/bpy/utils.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -281,10 +281,7 @@
     prefs = _bpy.context.user_preferences
 
     # add user scripts dir
-    if user_pref:
-        user_script_path = prefs.filepaths.script_directory
-    else:
-        user_script_path = None
+    user_script = prefs.filepaths.script_directory if user_pref else None
 
     if check_all:
         # all possible paths
@@ -294,7 +291,7 @@
         # only paths blender uses
         base_paths = _bpy_script_paths()
 
-    for path in base_paths + (user_script_path, ):
+    for path in base_paths + (user_script, ):
         if path:
             path = _os.path.normpath(path)
             if path not in scripts and _os.path.isdir(path):
@@ -303,13 +300,13 @@
     if subdir is None:
         return scripts
 
-    script_paths = []
+    scripts_subdir = []
     for path in scripts:
         path_subdir = _os.path.join(path, subdir)
         if _os.path.isdir(path_subdir):
-            script_paths.append(path_subdir)
+            scripts_subdir.append(path_subdir)
 
-    return script_paths
+    return scripts_subdir
 
 
 def refresh_script_paths():
@@ -464,7 +461,7 @@
     keyconfigs.active = kc_new
 
 
-def user_resource(type, path="", create=False):
+def user_resource(resource_type, path="", create=False):
     """
     Return a user resource path (normally from the users home directory).
 
@@ -479,7 +476,7 @@
     :rtype: string
     """
 
-    target_path = _user_resource(type, path)
+    target_path = _user_resource(resource_type, path)
 
     if create:
         # should always be true.

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -86,7 +86,7 @@
 
     # space_userprefs.py
     from bpy.props import StringProperty, EnumProperty
-    WindowManager = bpy.types.WindowManager
+    from bpy.types import WindowManager
 
     def addon_filter_items(self, context):
         import addon_utils

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2012-01-18 06:55:51 UTC (rev 43482)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -244,7 +244,7 @@
         return (rd.engine in cls.COMPAT_ENGINES)
 
 
-class RENDER_PT_embedded(RenderButtonsPanel, bpy.types.Panel):
+class RENDER_PT_embedded(RenderButtonsPanel, Panel):
     bl_label = "Embedded Player"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 

Copied: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_paint_common.py (from rev 43482, trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py)
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_paint_common.py	                        (rev 0)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_paint_common.py	2012-01-18 07:04:17 UTC (rev 43483)
@@ -0,0 +1,61 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list