[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39997] branches/soc-2011-tomato: Merging r39717 through r39983 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Wed Sep 7 09:49:47 CEST 2011
Revision: 39997
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39997
Author: nazgul
Date: 2011-09-07 07:49:46 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Merging r39717 through r39983 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39717
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39983
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst
branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
branches/soc-2011-tomato/doc/python_api/rst/bgl.rst
branches/soc-2011-tomato/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-tomato/doc/python_api/rst/info_overview.rst
branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
branches/soc-2011-tomato/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SquareFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SumFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SumFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_VolumeFactory.h
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.h
branches/soc-2011-tomato/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/soc-2011-tomato/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2011-tomato/intern/audaspace/fftw/AUD_BandPassReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_BufferReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_I3DDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Mixer.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_MixerFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ReadDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Space.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.cpp
branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/guardedalloc/MEM_sys_types.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-tomato/intern/itasc/kdl/frames_io.cpp
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/intern/opennl/superlu/superlu_sys_types.h
branches/soc-2011-tomato/intern/smoke/CMakeLists.txt
branches/soc-2011-tomato/intern/smoke/SConscript
branches/soc-2011-tomato/intern/smoke/intern/FFT_NOISE.h
branches/soc-2011-tomato/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2011-tomato/release/datafiles/blenderbuttons
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DV.py
branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2011-tomato/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2011-tomato/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-tomato/source/blender/CMakeLists.txt
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_action.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_constraint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_main.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sound.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/report.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_inline.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2011-tomato/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-tomato/source/blender/blenlib/intern/graph.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-tomato/source/blender/blenlib/intern/noise.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string.c
branches/soc-2011-tomato/source/blender/blenloader/BLO_sys_types.h
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/SConscript
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/blenpluginapi/iff.h
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.h
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.h
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.h
branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.h
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ExtraHandler.cpp
branches/soc-2011-tomato/source/blender/collada/ExtraHandler.h
branches/soc-2011-tomato/source/blender/collada/ExtraTags.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
branches/soc-2011-tomato/source/blender/collada/LightExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_deps.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_intern.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/animation/drivers.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-tomato/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_intern.h
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-tomato/source/blender/editors/include/ED_gpencil.h
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-tomato/source/blender/editors/include/ED_markers.h
branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/include/UI_icons.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_draw.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_intern.h
branches/soc-2011-tomato/source/blender/editors/space_action/action_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
branches/soc-2011-tomato/source/blender/editors/space_action/space_action.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_utils.c
branches/soc-2011-tomato/source/blender/editors/space_graph/space_graph.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_ops.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-tomato/source/blender/editors/space_nla/space_nla.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_state.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_intern.h
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_time/space_time.c
branches/soc-2011-tomato/source/blender/editors/space_time/time_intern.h
branches/soc-2011-tomato/source/blender/editors/space_time/time_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageCore.h
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/imbuf/intern/writeimage.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_armature_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_nla_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sound_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-tomato/source/blender/modifiers/SConscript
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/SConscript
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.h
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2011-tomato/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_IpoConvert.h
branches/soc-2011-tomato/source/gameengine/Converter/SConscript
branches/soc-2011-tomato/source/gameengine/Expressions/InputParser.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_XORController.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/npunix.c
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
branches/soc-2011-tomato/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_BBox.cpp
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_IObject.cpp
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_QList.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Exception.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterColor.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageMix.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/soc-2011-tomato/source/tests/check_deprecated.py
Added Paths:
-----------
branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_AnimateableProperty.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_AnimateableProperty.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileWriter.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_I3DHandle.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IHandle.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IWriter.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ReferenceHandler.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerEntry.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.h
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileWriter.h
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_speaker.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.h
branches/soc-2011-tomato/source/blender/collada/ErrorHandler.cpp
branches/soc-2011-tomato/source/blender/collada/ErrorHandler.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_speaker_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-tomato/source/blender/nodes/NOD_composite.h
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/NOD_socket.h
branches/soc-2011-tomato/source/blender/nodes/NOD_texture.h
branches/soc-2011-tomato/source/blender/nodes/composite/
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.h
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.h
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/nodes/shader/
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.h
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/texture/
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_ActionManager.h
Removed Paths:
-------------
branches/soc-2011-tomato/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_DefaultMixer.h
branches/soc-2011-tomato/source/blender/nodes/CMP_node.h
branches/soc-2011-tomato/source/blender/nodes/SHD_node.h
branches/soc-2011-tomato/source/blender/nodes/TEX_node.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/intern/CMP_nodes/
branches/soc-2011-tomato/source/blender/nodes/intern/CMP_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/CMP_util.h
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_nodes/
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_util.h
branches/soc-2011-tomato/source/blender/nodes/intern/TEX_nodes/
branches/soc-2011-tomato/source/blender/nodes/intern/TEX_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/TEX_util.h
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.h
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_viewer.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-39716
+ /trunk/blender:36831-39983
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-09-07 07:49:46 UTC (rev 39997)
@@ -800,7 +800,7 @@
else()
# keep GCC spesific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -846,11 +846,11 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
- ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
- ${LIBDIR}/opencollada/include/COLLADABaseUtils/include
- ${LIBDIR}/opencollada/include/COLLADAFramework/include
- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
- ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
+ ${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
@@ -951,7 +951,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})
@@ -1270,6 +1270,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
# disable because it gives warnings for printf() & friends.
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1277,6 +1278,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-09-07 07:49:46 UTC (rev 39997)
@@ -392,6 +392,7 @@
remove_flag("-Wstrict-prototypes")
remove_flag("-Wunused-parameter")
remove_flag("-Wwrite-strings")
+ remove_flag("-Wundef")
remove_flag("-Wshadow")
remove_flag("-Werror=[^ ]+")
remove_flag("-Werror")
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-09-07 07:49:46 UTC (rev 39997)
@@ -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-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2011-09-07 07:49:46 UTC (rev 39997)
@@ -23,7 +23,6 @@
BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-
BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
@@ -175,7 +174,7 @@
CC_WARN = [ '-Wall' ]
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32']
PLATFORM_LINKFLAGS = ['--stack,2097152']
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-09-07 07:49:46 UTC (rev 39997)
@@ -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-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-09-07 07:46:26 UTC (rev 39996)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-09-07 07:49:46 UTC (rev 39997)
@@ -540,7 +540,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']
@@ -573,10 +576,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)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list