[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39339] branches/soc-2011-radish: Merged 39257-39338

Jason Hays jason_hays22 at mymail.eku.edu
Fri Aug 12 17:48:09 CEST 2011


Revision: 39339
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39339
Author:   jason_hays22
Date:     2011-08-12 15:48:08 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Merged 39257-39338

Modified Paths:
--------------
    branches/soc-2011-radish/SConstruct
    branches/soc-2011-radish/build_files/buildbot/master.cfg
    branches/soc-2011-radish/build_files/scons/config/darwin-config.py
    branches/soc-2011-radish/build_files/scons/tools/btools.py
    branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2011-radish/release/scripts/modules/bpy/__init__.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/animsys_update.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/nla.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/object_align.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2011-radish/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_filebrowser.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_logic.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_outliner.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-radish/source/blender/blenlib/BLI_ghash.h
    branches/soc-2011-radish/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-radish/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-radish/source/blender/editors/object/object_add.c
    branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-radish/source/blender/windowmanager/WM_api.h
    branches/soc-2011-radish/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-radish/source/blender/windowmanager/intern/wm_operators.c

Property Changed:
----------------
    branches/soc-2011-radish/
    branches/soc-2011-radish/intern/audaspace/OpenAL/
    branches/soc-2011-radish/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:39258-39296
/trunk/blender:36835-39297
   + /trunk:39258-39296
/trunk/blender:36835-39338

Modified: branches/soc-2011-radish/SConstruct
===================================================================
--- branches/soc-2011-radish/SConstruct	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/SConstruct	2011-08-12 15:48:08 UTC (rev 39339)
@@ -268,7 +268,8 @@
     if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
         print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
         env['WITH_BF_3DMOUSE'] = 0
-        env['FOUND_NDOF_DRIVERS'] = 0
+    else:
+        env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
 
 
 if env['WITH_BF_OPENMP'] == 1:

Modified: branches/soc-2011-radish/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-radish/build_files/buildbot/master.cfg	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/build_files/buildbot/master.cfg	2011-08-12 15:48:08 UTC (rev 39339)
@@ -116,7 +116,7 @@
 add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
 add_builder(c, 'win32_scons', 'windows', generic_builder)
 add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'windows', generic_builder)
+add_builder(c, 'win64_scons', 'win64', generic_builder)
 #add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
 #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 

Modified: branches/soc-2011-radish/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/config/darwin-config.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/build_files/scons/config/darwin-config.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -284,7 +284,7 @@
 elif MACOSX_ARCHITECTURE == 'x86_64':
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
 
-# SpaceNavigator and related 3D mice
+# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
 WITH_BF_3DMOUSE = True
 
 #############################################################################
@@ -315,9 +315,6 @@
 	else:
 		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
 
-if FOUND_NDOF_DRIVERS:
-	PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient']
-
 #note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
 LLIBS = ['stdc++', 'SystemStubs']
 

Modified: branches/soc-2011-radish/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/tools/btools.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/build_files/scons/tools/btools.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -136,7 +136,7 @@
             'BF_NO_ELBEEM',
             'WITH_BF_CXX_GUARDEDALLOC',
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
-            'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'FOUND_NDOF_DRIVERS', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
+            'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
             ]
     
     # Have options here that scons expects to be lists
@@ -439,7 +439,6 @@
         (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
 
         (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
-        (BoolVariable('FOUND_NDOF_DRIVERS', 'We detected NDOF libs or framework', False)),
         (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
         ('BF_3DMOUSE', '3d mouse library base path', ''),
         ('BF_3DMOUSE_INC', '3d mouse library include path', ''),


Property changes on: branches/soc-2011-radish/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36835-38822,39182-39297
/trunk/intern/audaspace/OpenAL:39258-39296
   + /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36835-38822,39182-39338
/trunk/intern/audaspace/OpenAL:39258-39296

Modified: branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm	2011-08-12 15:48:08 UTC (rev 39339)
@@ -159,18 +159,22 @@
 
 GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
 {
-	UnregisterConnexionClient(m_clientID);
-	CleanupConnexionHandlers();
-	ghost_system = NULL;
-	ndof_manager = NULL;
+	if (available())
+	{
+		UnregisterConnexionClient(m_clientID);
+		CleanupConnexionHandlers();
+		ghost_system = NULL;
+		ndof_manager = NULL;
+	}
 }
-
-bool GHOST_NDOFManagerCocoa::available()
-{
-	// extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
-	// ^^ not needed since the entire framework is weak-linked
-	return InstallConnexionHandlers != NULL;
-	// this means that the driver is installed and dynamically linked to blender
+extern "C" {
+	bool GHOST_NDOFManagerCocoa::available()
+	{
+		extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
+		// Make the linker happy for the framework check (see link below for more info)
+		// http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
+		return InstallConnexionHandlers != NULL;
+		// this means that the driver is installed and dynamically linked to blender
+	}
 }
-
 #endif // WITH_INPUT_NDOF

Modified: branches/soc-2011-radish/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/soc-2011-radish/release/scripts/modules/bpy/__init__.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/release/scripts/modules/bpy/__init__.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -44,14 +44,18 @@
 ops = ops.ops_fake_module
 
 
-def _main():
-    import sys as _sys
+def main():
+    import sys
 
     # Possibly temp. addons path
     from os.path import join, dirname, normpath
-    _sys.path.append(normpath(join(dirname(__file__),
+    sys.path.append(normpath(join(dirname(__file__),
                                    "..", "..", "addons", "modules")))
 
+    # fake module to allow:
+    #   from bpy.types import Panel
+    sys.modules["bpy.types"] = types
+
     # if "-d" in sys.argv: # Enable this to measure startup speed
     if 0:
         import cProfile
@@ -65,6 +69,6 @@
         utils.load_scripts()
 
 
-_main()
+main()
 
-del _main
+del main

Modified: branches/soc-2011-radish/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_operators/add_mesh_torus.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/release/scripts/startup/bl_operators/add_mesh_torus.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -18,6 +18,7 @@
 
 # <pep8-80 compliant>
 import bpy
+from bpy.types import Operator
 import mathutils
 
 
@@ -81,7 +82,7 @@
                        )
 
 
-class AddTorus(bpy.types.Operator):
+class AddTorus(Operator):
     '''Add a torus mesh'''
     bl_idname = "mesh.primitive_torus_add"
     bl_label = "Add Torus"

Modified: branches/soc-2011-radish/release/scripts/startup/bl_operators/animsys_update.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_operators/animsys_update.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/release/scripts/startup/bl_operators/animsys_update.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -686,9 +686,10 @@
 
 
 import bpy
+from bpy.types import Operator
 
 
-class UpdateAnimData(bpy.types.Operator):
+class UpdateAnimData(Operator):
     """Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"""
     bl_idname = "anim.update_data_paths"
     bl_label = "Update Animation Data"

Modified: branches/soc-2011-radish/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_operators/image.py	2011-08-12 15:42:16 UTC (rev 39338)
+++ branches/soc-2011-radish/release/scripts/startup/bl_operators/image.py	2011-08-12 15:48:08 UTC (rev 39339)
@@ -19,10 +19,11 @@
 # <pep8-80 compliant>
 
 import bpy
+from bpy.types import Operator
 from bpy.props import StringProperty
 
 
-class EditExternally(bpy.types.Operator):
+class EditExternally(Operator):
     '''Edit image in an external application'''
     bl_idname = "image.external_edit"
     bl_label = "Image Edit Externally"
@@ -106,7 +107,7 @@
         return {'FINISHED'}
 
 
-class SaveDirty(bpy.types.Operator):
+class SaveDirty(Operator):
     """Save all modified textures"""
     bl_idname = "image.save_dirty"
     bl_label = "Save Dirty"
@@ -129,7 +130,7 @@
         return {'FINISHED'}
 
 
-class ProjectEdit(bpy.types.Operator):
+class ProjectEdit(Operator):
     """Edit a snapshot of the viewport in an external image editor"""
     bl_idname = "image.project_edit"
     bl_label = "Project Edit"
@@ -196,7 +197,7 @@
         return {'FINISHED'}
 
 
-class ProjectApply(bpy.types.Operator):
+class ProjectApply(Operator):
     """Project edited image back onto the object"""
     bl_idname = "image.project_apply"
     bl_label = "Project Apply"

Modified: branches/soc-2011-radish/release/scripts/startup/bl_operators/mesh.py
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list