[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39895] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 39826.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Sep 3 22:48:44 CEST 2011


Revision: 39895
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39895
Author:   kjym3
Date:     2011-09-03 20:48:43 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 39826.

Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.h
    branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_3DMath.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Buffer.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Buffer.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFunctions.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_I3DDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Mixer.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Mixer.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReadDevice.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReadDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Reference.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Space.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/jack/AUD_JackDevice.h
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/nla.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/startup/keyingsets_builtins.py
    branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_anim.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_nla.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sound.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/blenpluginapi/iff.h
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/collada/CameraExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ExtraHandler.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ExtraHandler.h
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/LightExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseUtils.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_markers.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/writeimage.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_nla_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterColor.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageMix.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_AnimateableProperty.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_AnimateableProperty.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_I3DHandle.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IHandle.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IWriter.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleFactory.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ResampleReader.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ResampleReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerEntry.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerEntry.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileWriter.h
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_speaker.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/speaker.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_speaker_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_speaker.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_ActionManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_ActionManager.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_DefaultMixer.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_DefaultMixer.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-39759
   + /trunk/blender:34011-39826

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2011-09-03 20:48:43 UTC (rev 39895)
@@ -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-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2011-09-03 20:48:43 UTC (rev 39895)
@@ -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-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2011-09-03 20:48:43 UTC (rev 39895)
@@ -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-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2011-09-03 20:48:43 UTC (rev 39895)
@@ -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-2008-mxcurioni/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2011-09-03 20:48:43 UTC (rev 39895)
@@ -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-2008-mxcurioni/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2011-09-03 19:33:07 UTC (rev 39894)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2011-09-03 20:48:43 UTC (rev 39895)
@@ -1539,6 +1539,67 @@
       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)
+
+      Plays an action.
+      
+      :arg name: the name of the action
+      :type name: string
+      :arg start: the start frame of the action
+      :type start: float
+      :arg end: the end frame of the action
+      :type end: float
+      :arg layer: the layer the action will play in (actions in different layers are added/blended together)
+      :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
+      :arg blendin: the amount of blending between this animation and the previous one on this layer
+      :type blendin: float
+      :arg play_mode: the play mode
+      :type play_mode: KX_ACTION_PLAY, KX_ACTION_LOOP, or KX_ACTION_PING_PONG
+      :arg layer_weight: how much of the previous layer to use for blending (0 = add)
+      :type layer_weight: float
+      :arg ipo_flags: flags for the old IPO behaviors (force, etc)
+      :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
+
+   .. method:: stopAction(layer=0)
+      
+      Stop playing the action on the given layer.
+      
+      :arg layer: The layer to stop playing.
+      :type layer: integer
+      
+   .. method:: getActionFrame(layer=0)
+   
+      Gets the current frame of the action playing in the supplied layer.
+      
+      :arg layer: The layer that you want to get the frame from.
+      :type layer: integer
+      

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list