[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39830] branches/bmesh/blender: svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Thu Sep 1 02:56:21 CEST 2011
Revision: 39830
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39830
Author: campbellbarton
Date: 2011-09-01 00:56:21 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39792
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/doc/python_api/rst/bge.render.rst
branches/bmesh/blender/doc/python_api/rst/bge.types.rst
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/audaspace/CMakeLists.txt
branches/bmesh/blender/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_Path-api.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/bmesh/blender/release/scripts/modules/bpy_types.py
branches/bmesh/blender/release/scripts/startup/bl_operators/nla.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_dopesheet.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_nla.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
branches/bmesh/blender/source/blender/blenfont/intern/blf.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenkernel/BKE_sound.h
branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/report.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenkernel/intern/unit.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/BLI_callbacks.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_kdtree.c
branches/bmesh/blender/source/blender/blenlib/intern/graph.c
branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
branches/bmesh/blender/source/blender/blenlib/intern/storage.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenpluginapi/iff.h
branches/bmesh/blender/source/blender/collada/AnimationExporter.h
branches/bmesh/blender/source/blender/collada/ArmatureImporter.cpp
branches/bmesh/blender/source/blender/collada/ExtraHandler.cpp
branches/bmesh/blender/source/blender/editors/animation/anim_channels_defines.c
branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_select.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/space_console/space_console.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_draw.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_edit.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/imbuf/intern/indexer_dv.c
branches/bmesh/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/bmesh/blender/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/bmesh/blender/source/blender/imbuf/intern/rectop.c
branches/bmesh/blender/source/blender/imbuf/intern/writeimage.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/intern/bpy_intern_string.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/bmesh/blender/source/gameengine/VideoTexture/FilterColor.h
branches/bmesh/blender/source/gameengine/VideoTexture/ImageMix.cpp
Removed Paths:
-------------
branches/bmesh/blender/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_DefaultMixer.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39792
+ /trunk/blender:31524-39829
Modified: branches/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-09-01 00:56:21 UTC (rev 39830)
@@ -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/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-09-01 00:56:21 UTC (rev 39830)
@@ -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/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-09-01 00:56:21 UTC (rev 39830)
@@ -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/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-09-01 00:56:21 UTC (rev 39830)
@@ -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/bmesh/blender/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.render.rst 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/doc/python_api/rst/bge.render.rst 2011-09-01 00:56:21 UTC (rev 39830)
@@ -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/bmesh/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.types.rst 2011-09-01 00:35:30 UTC (rev 39829)
+++ branches/bmesh/blender/doc/python_api/rst/bge.types.rst 2011-09-01 00:56:21 UTC (rev 39830)
@@ -1542,59 +1542,63 @@
.. 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
:arg blendin: the amount of blending between this animation and the previous one on this layer
- :type blendin: float
+ :type blendin: float
:arg play_mode: the play mode
- :type play_mode: KX_ACTION_PLAY, KX_ACTION_LOOP, or KX_ACTION_PING_PONG
+ :type play_mode: KX_ACTION_MODE_PLAY, KX_ACTION_MODE_LOOP, or KX_ACTION_MODE_PING_PONG
:arg layer_weight: how much of the previous layer to use for blending (0 = add)
- :type layer_weight: float
+ :type layer_weight: float
:arg ipo_flags: flags for the old IPO behaviors (force, etc)
- :type ipo_flags: int bitfield
+ :type ipo_flags: int bitfield
:arg speed: the playback speed of the action as a factor (1.0 = normal speed, 2.0 = 2x speed, etc)
- :type speed: float
+ :type speed: float
.. method:: stopAction(layer=0)
- Stop playing the action on the given layer.
-
- :arg layer: The layer to stop playing.
- :type layer: integer
-
+ Stop playing the action on the given layer.
+
+ :arg layer: The layer to stop playing.
+ :type layer: integer
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list