[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40178] branches/soc-2011-radish: svn merge -r39800:39900 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Campbell Barton ideasman42 at gmail.com
Tue Sep 13 09:19:37 CEST 2011 

Revision: 40178
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40178
Author:   campbellbarton
Date:     2011-09-13 07:19:36 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
svn merge -r39800:39900 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/soc-2011-radish/CMakeLists.txt
    branches/soc-2011-radish/build_files/scons/config/darwin-config.py
    branches/soc-2011-radish/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-radish/build_files/scons/tools/Blender.py
    branches/soc-2011-radish/build_files/scons/tools/btools.py
    branches/soc-2011-radish/doc/python_api/rst/bge.render.rst
    branches/soc-2011-radish/doc/python_api/rst/bge.types.rst
    branches/soc-2011-radish/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
    branches/soc-2011-radish/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2011-radish/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/soc-2011-radish/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2011-radish/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2011-radish/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-radish/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-radish/intern/iksolver/intern/IK_QSegment.cpp
    branches/soc-2011-radish/intern/opennl/superlu/superlu_sys_types.h
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-radish/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-radish/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-radish/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-radish/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-radish/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-radish/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-radish/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2011-radish/source/blender/blenlib/intern/math_geom.c
    branches/soc-2011-radish/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-radish/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-radish/source/blender/blenpluginapi/iff.h
    branches/soc-2011-radish/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-radish/source/blender/collada/AnimationExporter.h
    branches/soc-2011-radish/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-radish/source/blender/collada/AnimationImporter.h
    branches/soc-2011-radish/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2011-radish/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-radish/source/blender/collada/ArmatureImporter.h
    branches/soc-2011-radish/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-radish/source/blender/collada/ExtraHandler.cpp
    branches/soc-2011-radish/source/blender/collada/ExtraTags.cpp
    branches/soc-2011-radish/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-radish/source/blender/collada/SkinInfo.cpp
    branches/soc-2011-radish/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-radish/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-radish/source/blender/editors/animation/keyframing.c
    branches/soc-2011-radish/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-radish/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-radish/source/blender/editors/object/object_add.c
    branches/soc-2011-radish/source/blender/editors/object/object_bake.c
    branches/soc-2011-radish/source/blender/editors/object/object_edit.c
    branches/soc-2011-radish/source/blender/editors/object/object_hook.c
    branches/soc-2011-radish/source/blender/editors/object/object_relations.c
    branches/soc-2011-radish/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-radish/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-radish/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-radish/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-radish/source/blender/editors/space_text/space_text.c
    branches/soc-2011-radish/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-radish/source/blender/editors/space_text/text_intern.h
    branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-radish/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-radish/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-radish/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2011-radish/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-radish/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2011-radish/source/blender/imbuf/intern/rectop.c
    branches/soc-2011-radish/source/blender/imbuf/intern/writeimage.c
    branches/soc-2011-radish/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-radish/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-radish/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-radish/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-radish/source/blender/python/generic/bgl.c
    branches/soc-2011-radish/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-radish/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-radish/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2011-radish/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-radish/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-radish/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-radish/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-radish/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-radish/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-radish/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2011-radish/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-radish/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2011-radish/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-radish/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2011-radish/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2011-radish/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2011-radish/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/soc-2011-radish/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-radish/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-radish/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2011-radish/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2011-radish/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2011-radish/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2011-radish/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/soc-2011-radish/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-radish/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-radish/source/gameengine/GamePlayer/xembed/npunix.c
    branches/soc-2011-radish/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/soc-2011-radish/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2011-radish/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2011-radish/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2011-radish/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2011-radish/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2011-radish/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2011-radish/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-radish/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-radish/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/soc-2011-radish/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2011-radish/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2011-radish/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2011-radish/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/Exception.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/Exception.h
    branches/soc-2011-radish/source/gameengine/VideoTexture/FilterColor.h
    branches/soc-2011-radish/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/ImageMix.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2011-radish/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2011-radish/source/tests/check_deprecated.py

Added Paths:
-----------
    branches/soc-2011-radish/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-radish/intern/tools/credits_svn_gen.py

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-39800
   + /trunk:39258-39296
/trunk/blender:36835-39900

Modified: branches/soc-2011-radish/CMakeLists.txt
===================================================================
--- branches/soc-2011-radish/CMakeLists.txt	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/CMakeLists.txt	2011-09-13 07:19:36 UTC (rev 40178)
@@ -948,7 +948,7 @@
 		# we use precompiled libraries for py 3.2 and up by default
 
 		# normally cached but not since we include them with blender
-                set(PYTHON_VERSION 3.2)
+		set(PYTHON_VERSION 3.2)
 		set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
 		set(PYTHON_LIBRARY python${PYTHON_VERSION})

Modified: branches/soc-2011-radish/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/config/darwin-config.py	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/build_files/scons/config/darwin-config.py	2011-09-13 07:19:36 UTC (rev 40178)
@@ -14,7 +14,7 @@
 ###################     Cocoa & architecture settings      ##################
 #############################################################################
 WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
 
 
 cmd = 'uname -p'
@@ -104,15 +104,27 @@
 BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
 #bz2 is a standard osx dynlib
 
-# python 3.1 uses precompiled libraries in bf svn /lib by default
 BF_PYTHON_VERSION = '3.2'
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
-# BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+WITH_OSX_STATICPYTHON = True
+
+if WITH_OSX_STATICPYTHON:
+	# python 3.2 uses precompiled libraries in bf svn /lib by default
+
+	BF_PYTHON = LIBDIR + '/python'
+	BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+else:
+	# python 3.2 uses Python-framework additionally installed in /Library/Frameworks
 	
+	BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+	BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
+	BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+	#BF_PYTHON_LIB = ''
+	BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
+	
 WITH_BF_OPENAL = True
 #different lib must be used  following version of gcc
 # for gcc 3.3
@@ -315,6 +327,10 @@
 	else:
 		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
 
+if not WITH_OSX_STATICPYTHON:
+		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
+
+
 #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
 #for 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
 if MACOSX_DEPLOYMENT_TARGET == '10.7':

Modified: branches/soc-2011-radish/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/config/win32-vc-config.py	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/build_files/scons/config/win32-vc-config.py	2011-09-13 07:19:36 UTC (rev 40178)
@@ -40,7 +40,7 @@
 BF_JACK_LIB = 'libjack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
-WITH_BF_SNDFILE = False
+WITH_BF_SNDFILE = True
 BF_SNDFILE = LIBDIR + '/sndfile'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'libsndfile-1'

Modified: branches/soc-2011-radish/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/tools/Blender.py	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/build_files/scons/tools/Blender.py	2011-09-13 07:19:36 UTC (rev 40178)
@@ -536,7 +536,10 @@
     print("Installing to %s"%(installdir))
     # TODO, use tar.
     python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
-    print("unzipping to app-bundle: %s"%(python_zip))
+    if env['WITH_OSX_STATICPYTHON']:
+        print("unzipping to app-bundle: %s"%(python_zip))
+    else:
+        print("dynamic build - make sure to have python3.x-framework installed")
     bldroot = env.Dir('.').abspath
     binary = env['BINARYKIND']
      
@@ -569,10 +572,11 @@
     commands.getoutput(cmd)
     cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
     commands.getoutput(cmd)
-    cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
-    commands.getoutput(cmd)
-    cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
-    commands.getoutput(cmd)
+    if env['WITH_OSX_STATICPYTHON']:
+        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
+        commands.getoutput(cmd)
+        cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
+        commands.getoutput(cmd) 
 
     if binary == 'blender':#not copy everything for blenderplayer
         cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)

Modified: branches/soc-2011-radish/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/tools/btools.py	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/build_files/scons/tools/btools.py	2011-09-13 07:19:36 UTC (rev 40178)
@@ -78,7 +78,7 @@
 
 def validate_arguments(args, bc):
     opts_list = [
-            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
+            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
             'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
             'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
             'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', 'WITH_BF_STATICLIBSAMPLERATE', 'BF_LIBSAMPLERATE_LIB_STATIC',
@@ -230,6 +230,7 @@
         ('BF_PYTHON_LIBPATH', 'Library path', ''),
         ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
         (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
+        (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
         ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
 
         (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),

Modified: branches/soc-2011-radish/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2011-radish/doc/python_api/rst/bge.render.rst	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/doc/python_api/rst/bge.render.rst	2011-09-13 07:19:36 UTC (rev 40178)
@@ -215,7 +215,19 @@
    :type setting: string (lights, shaders, shadows, ramps, nodes, extra_textures)
    :rtype: boolean
 
+.. function:: setAnisotropicFiltering(level)
 
+   Set the anisotropic filtering level for textures.
+   
+   :arg level: The new anisotropic filtering level to use
+   :type level: integer (must be one of 1, 2, 4, 8, 16)
+   
+.. function:: getAnisotropicFiltering()
+
+   Get the anisotropic filtering level used for textures.
+   
+   :rtype: integer (one of 1, 2, 4, 8, 16)
+   
 .. function:: drawLine(fromVec,toVec,color)
 
    Draw a line in the 3D scene.

Modified: branches/soc-2011-radish/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-radish/doc/python_api/rst/bge.types.rst	2011-09-13 06:39:17 UTC (rev 40177)
+++ branches/soc-2011-radish/doc/python_api/rst/bge.types.rst	2011-09-13 07:19:36 UTC (rev 40178)
@@ -1539,62 +1539,66 @@
       Return the value matching key, or the default value if its not found.
       :return: The key value or a default.
 
-   .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0 blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+   .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
 
       Plays an action.
-	  
+      
       :arg name: the name of the action
-	  :type name: string
+      :type name: string
       :arg start: the start frame of the action
-	  :type start: float
+      :type start: float
       :arg end: the end frame of the action
-	  :type end: float
+      :type end: float
       :arg layer: the layer the action will play in (actions in different layers are added/blended together)
-	  :type layer: integer
+      :type layer: integer
       :arg priority: only play this action if there isn't an action currently playing in this layer with a higher (lower number) priority
-	  :type priority: integer
+      :type priority: integer

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list