[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52193] branches/ge_components: Merged revision(s) 51874-52165 from trunk/blender:
Mitchell Stokes
mogurijin at gmail.com
Wed Nov 14 01:06:14 CET 2012
Revision: 52193
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52193
Author: moguri
Date: 2012-11-14 00:06:12 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Merged revision(s) 51874-52165 from trunk/blender:
Modified Paths:
--------------
branches/ge_components/CMakeLists.txt
branches/ge_components/GNUmakefile
branches/ge_components/SConstruct
branches/ge_components/build_files/buildbot/config/user-config-glibc211-i686.py
branches/ge_components/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/ge_components/build_files/buildbot/config/user-config-glibc27-i686.py
branches/ge_components/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/ge_components/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/ge_components/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/ge_components/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/ge_components/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/ge_components/build_files/cmake/Modules/FindOpenColorIO.cmake
branches/ge_components/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/ge_components/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/ge_components/build_files/cmake/cmake_static_check_clang_array.py
branches/ge_components/build_files/cmake/cmake_static_check_cppcheck.py
branches/ge_components/build_files/cmake/cmake_static_check_smatch.py
branches/ge_components/build_files/cmake/cmake_static_check_sparse.py
branches/ge_components/build_files/cmake/cmake_static_check_splint.py
branches/ge_components/build_files/cmake/macros.cmake
branches/ge_components/build_files/scons/config/Modules/FindPython.py
branches/ge_components/build_files/scons/config/darwin-config.py
branches/ge_components/build_files/scons/config/freebsd7-config.py
branches/ge_components/build_files/scons/config/freebsd8-config.py
branches/ge_components/build_files/scons/config/freebsd9-config.py
branches/ge_components/build_files/scons/config/linux-config.py
branches/ge_components/build_files/scons/config/linuxcross-config.py
branches/ge_components/build_files/scons/config/win32-mingw-config.py
branches/ge_components/build_files/scons/config/win32-vc-config.py
branches/ge_components/build_files/scons/config/win64-mingw-config.py
branches/ge_components/build_files/scons/config/win64-vc-config.py
branches/ge_components/build_files/scons/tools/Blender.py
branches/ge_components/build_files/scons/tools/btools.py
branches/ge_components/doc/python_api/rst/bge.types.rst
branches/ge_components/doc/python_api/rst/info_gotcha.rst
branches/ge_components/extern/carve/lib/intersect_face_division.cpp
branches/ge_components/extern/glew/src/glew.c
branches/ge_components/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/ge_components/extern/libmv/libmv/multiview/euclidean_resection.h
branches/ge_components/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/ge_components/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/ge_components/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/ge_components/extern/libmv/libmv/simple_pipeline/resect.cc
branches/ge_components/extern/libmv/libmv/simple_pipeline/resect.h
branches/ge_components/extern/libmv/libmv-capi.cpp
branches/ge_components/extern/libmv/libmv-capi.h
branches/ge_components/intern/CMakeLists.txt
branches/ge_components/intern/SConscript
branches/ge_components/intern/audaspace/CMakeLists.txt
branches/ge_components/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/ge_components/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/ge_components/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/ge_components/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/ge_components/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_DelayFactory.h
branches/ge_components/intern/audaspace/FX/AUD_DelayReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_DelayReader.h
branches/ge_components/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_DoubleFactory.h
branches/ge_components/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_DoubleReader.h
branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/ge_components/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_EffectFactory.h
branches/ge_components/intern/audaspace/FX/AUD_EffectReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_EffectReader.h
branches/ge_components/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/ge_components/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_FaderFactory.h
branches/ge_components/intern/audaspace/FX/AUD_FaderReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_FaderReader.h
branches/ge_components/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_HighpassFactory.h
branches/ge_components/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/ge_components/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/ge_components/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_LimiterFactory.h
branches/ge_components/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_LimiterReader.h
branches/ge_components/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_LoopFactory.h
branches/ge_components/intern/audaspace/FX/AUD_LoopReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_LoopReader.h
branches/ge_components/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_LowpassFactory.h
branches/ge_components/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_PingPongFactory.h
branches/ge_components/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_PitchFactory.h
branches/ge_components/intern/audaspace/FX/AUD_PitchReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_PitchReader.h
branches/ge_components/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_RectifyFactory.h
branches/ge_components/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_ReverseFactory.h
branches/ge_components/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_ReverseReader.h
branches/ge_components/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_SquareFactory.h
branches/ge_components/intern/audaspace/FX/AUD_SumFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_SumFactory.h
branches/ge_components/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/ge_components/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/ge_components/intern/audaspace/FX/AUD_SuperposeReader.h
branches/ge_components/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/ge_components/intern/audaspace/FX/AUD_VolumeFactory.h
branches/ge_components/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/ge_components/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/ge_components/intern/audaspace/Python/AUD_PyAPI.cpp
branches/ge_components/intern/audaspace/SConscript
branches/ge_components/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/ge_components/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/ge_components/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/ge_components/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/ge_components/intern/audaspace/intern/AUD_BufferReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_BufferReader.h
branches/ge_components/intern/audaspace/intern/AUD_C-API.cpp
branches/ge_components/intern/audaspace/intern/AUD_C-API.h
branches/ge_components/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/ge_components/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/ge_components/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_ConverterFactory.h
branches/ge_components/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_ConverterReader.h
branches/ge_components/intern/audaspace/intern/AUD_FileFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_FileFactory.h
branches/ge_components/intern/audaspace/intern/AUD_FileWriter.cpp
branches/ge_components/intern/audaspace/intern/AUD_FileWriter.h
branches/ge_components/intern/audaspace/intern/AUD_IDevice.h
branches/ge_components/intern/audaspace/intern/AUD_IFactory.h
branches/ge_components/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/ge_components/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/ge_components/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/ge_components/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/ge_components/intern/audaspace/intern/AUD_Mixer.h
branches/ge_components/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_MixerFactory.h
branches/ge_components/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/ge_components/intern/audaspace/intern/AUD_NULLDevice.h
branches/ge_components/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_ResampleReader.h
branches/ge_components/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/ge_components/intern/audaspace/intern/AUD_SequencerEntry.h
branches/ge_components/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_SequencerFactory.h
branches/ge_components/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/ge_components/intern/audaspace/intern/AUD_SequencerHandle.h
branches/ge_components/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/ge_components/intern/audaspace/intern/AUD_SequencerReader.h
branches/ge_components/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_SilenceFactory.h
branches/ge_components/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_SinusFactory.h
branches/ge_components/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/ge_components/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/ge_components/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/ge_components/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/ge_components/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/ge_components/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/ge_components/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/ge_components/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/ge_components/intern/bsp/intern/BOP_CarveInterface.cpp
branches/ge_components/intern/container/CTR_HashedPtr.h
branches/ge_components/intern/cycles/CMakeLists.txt
branches/ge_components/intern/cycles/SConscript
branches/ge_components/intern/cycles/app/CMakeLists.txt
branches/ge_components/intern/cycles/app/cycles_test.cpp
branches/ge_components/intern/cycles/blender/CCL_api.h
branches/ge_components/intern/cycles/blender/addon/__init__.py
branches/ge_components/intern/cycles/blender/addon/engine.py
branches/ge_components/intern/cycles/blender/addon/enums.py
branches/ge_components/intern/cycles/blender/addon/ui.py
branches/ge_components/intern/cycles/blender/blender_camera.cpp
branches/ge_components/intern/cycles/blender/blender_mesh.cpp
branches/ge_components/intern/cycles/blender/blender_object.cpp
branches/ge_components/intern/cycles/blender/blender_particles.cpp
branches/ge_components/intern/cycles/blender/blender_python.cpp
branches/ge_components/intern/cycles/blender/blender_session.cpp
branches/ge_components/intern/cycles/blender/blender_session.h
branches/ge_components/intern/cycles/blender/blender_shader.cpp
branches/ge_components/intern/cycles/blender/blender_sync.cpp
branches/ge_components/intern/cycles/blender/blender_sync.h
branches/ge_components/intern/cycles/blender/blender_util.h
branches/ge_components/intern/cycles/cmake/external_libs.cmake
branches/ge_components/intern/cycles/device/device.cpp
branches/ge_components/intern/cycles/device/device.h
branches/ge_components/intern/cycles/device/device_cpu.cpp
branches/ge_components/intern/cycles/device/device_cuda.cpp
branches/ge_components/intern/cycles/device/device_intern.h
branches/ge_components/intern/cycles/device/device_multi.cpp
branches/ge_components/intern/cycles/device/device_network.cpp
branches/ge_components/intern/cycles/device/device_opencl.cpp
branches/ge_components/intern/cycles/device/device_task.cpp
branches/ge_components/intern/cycles/kernel/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/closure/bsdf_ward.h
branches/ge_components/intern/cycles/kernel/kernel_object.h
branches/ge_components/intern/cycles/kernel/kernel_path.h
branches/ge_components/intern/cycles/kernel/kernel_projection.h
branches/ge_components/intern/cycles/kernel/kernel_shader.h
branches/ge_components/intern/cycles/kernel/kernel_types.h
branches/ge_components/intern/cycles/kernel/osl/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/osl/background.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_closures.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_closures.h
branches/ge_components/intern/cycles/kernel/osl/osl_globals.h
branches/ge_components/intern/cycles/kernel/osl/osl_services.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_services.h
branches/ge_components/intern/cycles/kernel/osl/osl_shader.cpp
branches/ge_components/intern/cycles/kernel/shaders/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/shaders/node_geometry.osl
branches/ge_components/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/ge_components/intern/cycles/kernel/shaders/stdosl.h
branches/ge_components/intern/cycles/kernel/svm/svm.h
branches/ge_components/intern/cycles/kernel/svm/svm_bsdf.h
branches/ge_components/intern/cycles/kernel/svm/svm_closure.h
branches/ge_components/intern/cycles/kernel/svm/svm_geometry.h
branches/ge_components/intern/cycles/kernel/svm/svm_image.h
branches/ge_components/intern/cycles/kernel/svm/svm_tex_coord.h
branches/ge_components/intern/cycles/kernel/svm/svm_types.h
branches/ge_components/intern/cycles/render/attribute.cpp
branches/ge_components/intern/cycles/render/buffers.cpp
branches/ge_components/intern/cycles/render/camera.cpp
branches/ge_components/intern/cycles/render/camera.h
branches/ge_components/intern/cycles/render/graph.cpp
branches/ge_components/intern/cycles/render/graph.h
branches/ge_components/intern/cycles/render/image.h
branches/ge_components/intern/cycles/render/light.cpp
branches/ge_components/intern/cycles/render/mesh.cpp
branches/ge_components/intern/cycles/render/nodes.cpp
branches/ge_components/intern/cycles/render/nodes.h
branches/ge_components/intern/cycles/render/osl.cpp
branches/ge_components/intern/cycles/render/osl.h
branches/ge_components/intern/cycles/render/particles.cpp
branches/ge_components/intern/cycles/render/scene.cpp
branches/ge_components/intern/cycles/render/scene.h
branches/ge_components/intern/cycles/render/session.cpp
branches/ge_components/intern/cycles/render/session.h
branches/ge_components/intern/cycles/render/tile.cpp
branches/ge_components/intern/cycles/util/util_attribute.cpp
branches/ge_components/intern/cycles/util/util_boundbox.h
branches/ge_components/intern/cycles/util/util_math.h
branches/ge_components/intern/cycles/util/util_opencl.cpp
branches/ge_components/intern/cycles/util/util_progress.h
branches/ge_components/intern/cycles/util/util_task.cpp
branches/ge_components/intern/cycles/util/util_task.h
branches/ge_components/intern/cycles/util/util_transform.cpp
branches/ge_components/intern/cycles/util/util_transform.h
branches/ge_components/intern/cycles/util/util_types.h
branches/ge_components/intern/ghost/CMakeLists.txt
branches/ge_components/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/ge_components/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_components/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_components/intern/guardedalloc/cpp/mallocn.cpp
branches/ge_components/intern/itasc/CMakeLists.txt
branches/ge_components/intern/itasc/kdl/chain.hpp
branches/ge_components/intern/itasc/kdl/tree.hpp
branches/ge_components/intern/memutil/MEM_SmartPtr.h
branches/ge_components/release/datafiles/blender_icons.png
branches/ge_components/release/datafiles/prvicons.png
branches/ge_components/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/ge_components/release/scripts/startup/bl_operators/presets.py
branches/ge_components/release/scripts/startup/bl_ui/properties_data_camera.py
branches/ge_components/release/scripts/startup/bl_ui/properties_data_curve.py
branches/ge_components/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/ge_components/release/scripts/startup/bl_ui/properties_render.py
branches/ge_components/release/scripts/startup/bl_ui/space_clip.py
branches/ge_components/release/scripts/startup/bl_ui/space_image.py
branches/ge_components/release/scripts/startup/bl_ui/space_sequencer.py
branches/ge_components/release/scripts/startup/bl_ui/space_userpref.py
branches/ge_components/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_components/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/ge_components/source/blender/avi/intern/avi.c
branches/ge_components/source/blender/blenfont/BLF_translation.h
branches/ge_components/source/blender/blenfont/CMakeLists.txt
branches/ge_components/source/blender/blenfont/SConscript
branches/ge_components/source/blender/blenfont/intern/blf.c
branches/ge_components/source/blender/blenfont/intern/blf_lang.c
branches/ge_components/source/blender/blenfont/intern/blf_translation.c
branches/ge_components/source/blender/blenkernel/BKE_blender.h
branches/ge_components/source/blender/blenkernel/BKE_global.h
branches/ge_components/source/blender/blenkernel/BKE_lamp.h
branches/ge_components/source/blender/blenkernel/BKE_mesh.h
branches/ge_components/source/blender/blenkernel/BKE_multires.h
branches/ge_components/source/blender/blenkernel/BKE_node.h
branches/ge_components/source/blender/blenkernel/BKE_sequencer.h
branches/ge_components/source/blender/blenkernel/BKE_utildefines.h
branches/ge_components/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_components/source/blender/blenkernel/intern/anim.c
branches/ge_components/source/blender/blenkernel/intern/anim_sys.c
branches/ge_components/source/blender/blenkernel/intern/bmfont.c
branches/ge_components/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_components/source/blender/blenkernel/intern/curve.c
branches/ge_components/source/blender/blenkernel/intern/depsgraph.c
branches/ge_components/source/blender/blenkernel/intern/displist.c
branches/ge_components/source/blender/blenkernel/intern/image.c
branches/ge_components/source/blender/blenkernel/intern/lamp.c
branches/ge_components/source/blender/blenkernel/intern/library.c
branches/ge_components/source/blender/blenkernel/intern/mask_evaluate.c
branches/ge_components/source/blender/blenkernel/intern/mesh.c
branches/ge_components/source/blender/blenkernel/intern/movieclip.c
branches/ge_components/source/blender/blenkernel/intern/multires.c
branches/ge_components/source/blender/blenkernel/intern/node.c
branches/ge_components/source/blender/blenkernel/intern/object.c
branches/ge_components/source/blender/blenkernel/intern/ocean.c
branches/ge_components/source/blender/blenkernel/intern/particle_system.c
branches/ge_components/source/blender/blenkernel/intern/scene.c
branches/ge_components/source/blender/blenkernel/intern/seqmodifier.c
branches/ge_components/source/blender/blenkernel/intern/sequencer.c
branches/ge_components/source/blender/blenkernel/intern/shrinkwrap.c
branches/ge_components/source/blender/blenkernel/intern/smoke.c
branches/ge_components/source/blender/blenkernel/intern/sound.c
branches/ge_components/source/blender/blenkernel/intern/subsurf_ccg.c
branches/ge_components/source/blender/blenkernel/intern/text.c
branches/ge_components/source/blender/blenkernel/intern/tracking.c
branches/ge_components/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_components/source/blender/blenlib/BLI_bpath.h
branches/ge_components/source/blender/blenlib/BLI_math.h
branches/ge_components/source/blender/blenlib/BLI_math_matrix.h
branches/ge_components/source/blender/blenlib/BLI_pbvh.h
branches/ge_components/source/blender/blenlib/BLI_quadric.h
branches/ge_components/source/blender/blenlib/BLI_string_utf8.h
branches/ge_components/source/blender/blenlib/CMakeLists.txt
branches/ge_components/source/blender/blenlib/PIL_time.h
branches/ge_components/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/ge_components/source/blender/blenlib/intern/bpath.c
branches/ge_components/source/blender/blenlib/intern/math_base_inline.c
branches/ge_components/source/blender/blenlib/intern/math_color_inline.c
branches/ge_components/source/blender/blenlib/intern/math_matrix.c
branches/ge_components/source/blender/blenlib/intern/noise.c
branches/ge_components/source/blender/blenlib/intern/pbvh.c
branches/ge_components/source/blender/blenlib/intern/quadric.c
branches/ge_components/source/blender/blenlib/intern/smallhash.c
branches/ge_components/source/blender/blenlib/intern/string_utf8.c
branches/ge_components/source/blender/blenlib/intern/voronoi.c
branches/ge_components/source/blender/blenloader/intern/readfile.c
branches/ge_components/source/blender/blenloader/intern/versioning_250.c
branches/ge_components/source/blender/blenloader/intern/writefile.c
branches/ge_components/source/blender/bmesh/bmesh_class.h
branches/ge_components/source/blender/bmesh/intern/bmesh_construct.c
branches/ge_components/source/blender/bmesh/intern/bmesh_core.c
branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_collapse.c
branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
branches/ge_components/source/blender/bmesh/intern/bmesh_interp.c
branches/ge_components/source/blender/bmesh/intern/bmesh_iterators.c
branches/ge_components/source/blender/bmesh/intern/bmesh_iterators.h
branches/ge_components/source/blender/bmesh/intern/bmesh_mods.c
branches/ge_components/source/blender/bmesh/intern/bmesh_opdefines.c
branches/ge_components/source/blender/bmesh/intern/bmesh_operator_api.h
branches/ge_components/source/blender/bmesh/intern/bmesh_operators.c
branches/ge_components/source/blender/bmesh/intern/bmesh_polygon.c
branches/ge_components/source/blender/bmesh/intern/bmesh_queries.c
branches/ge_components/source/blender/bmesh/intern/bmesh_queries.h
branches/ge_components/source/blender/bmesh/operators/bmo_bevel.c
branches/ge_components/source/blender/bmesh/operators/bmo_create.c
branches/ge_components/source/blender/bmesh/operators/bmo_extrude.c
branches/ge_components/source/blender/bmesh/operators/bmo_hull.c
branches/ge_components/source/blender/bmesh/operators/bmo_mirror.c
branches/ge_components/source/blender/bmesh/operators/bmo_removedoubles.c
branches/ge_components/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/ge_components/source/blender/bmesh/operators/bmo_subdivide.c
branches/ge_components/source/blender/bmesh/operators/bmo_symmetrize.c
branches/ge_components/source/blender/bmesh/operators/bmo_utils.c
branches/ge_components/source/blender/collada/AnimationImporter.cpp
branches/ge_components/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/ge_components/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/ge_components/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/ge_components/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/ge_components/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/ge_components/source/blender/compositor/operations/COM_PixelateOperation.h
branches/ge_components/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/ge_components/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/ge_components/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/ge_components/source/blender/compositor/operations/COM_ScaleOperation.h
branches/ge_components/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/ge_components/source/blender/editors/animation/anim_draw.c
branches/ge_components/source/blender/editors/animation/anim_filter.c
branches/ge_components/source/blender/editors/animation/keyingsets.c
branches/ge_components/source/blender/editors/armature/editarmature_sketch.c
branches/ge_components/source/blender/editors/curve/editcurve.c
branches/ge_components/source/blender/editors/gpencil/gpencil_edit.c
branches/ge_components/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_components/source/blender/editors/include/ED_gpencil.h
branches/ge_components/source/blender/editors/include/UI_interface.h
branches/ge_components/source/blender/editors/include/UI_resources.h
branches/ge_components/source/blender/editors/interface/interface.c
branches/ge_components/source/blender/editors/interface/interface_draw.c
branches/ge_components/source/blender/editors/interface/interface_handlers.c
branches/ge_components/source/blender/editors/interface/interface_intern.h
branches/ge_components/source/blender/editors/interface/interface_layout.c
branches/ge_components/source/blender/editors/interface/interface_regions.c
branches/ge_components/source/blender/editors/interface/interface_templates.c
branches/ge_components/source/blender/editors/interface/interface_widgets.c
branches/ge_components/source/blender/editors/interface/resources.c
branches/ge_components/source/blender/editors/mesh/editmesh_bvh.c
branches/ge_components/source/blender/editors/mesh/editmesh_knife.c
branches/ge_components/source/blender/editors/mesh/editmesh_loopcut.c
branches/ge_components/source/blender/editors/mesh/editmesh_select.c
branches/ge_components/source/blender/editors/mesh/editmesh_tools.c
branches/ge_components/source/blender/editors/object/object_add.c
branches/ge_components/source/blender/editors/physics/physics_fluid.c
branches/ge_components/source/blender/editors/render/render_internal.c
branches/ge_components/source/blender/editors/render/render_preview.c
branches/ge_components/source/blender/editors/render/render_update.c
branches/ge_components/source/blender/editors/screen/screendump.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_components/source/blender/editors/space_buttons/buttons_context.c
branches/ge_components/source/blender/editors/space_buttons/buttons_texture.c
branches/ge_components/source/blender/editors/space_clip/clip_draw.c
branches/ge_components/source/blender/editors/space_clip/clip_ops.c
branches/ge_components/source/blender/editors/space_clip/clip_utils.c
branches/ge_components/source/blender/editors/space_clip/tracking_ops.c
branches/ge_components/source/blender/editors/space_file/filelist.c
branches/ge_components/source/blender/editors/space_file/filesel.c
branches/ge_components/source/blender/editors/space_graph/space_graph.c
branches/ge_components/source/blender/editors/space_info/space_info.c
branches/ge_components/source/blender/editors/space_node/drawnode.c
branches/ge_components/source/blender/editors/space_node/node_draw.c
branches/ge_components/source/blender/editors/space_node/node_edit.c
branches/ge_components/source/blender/editors/space_outliner/outliner_draw.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_add.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_draw.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_edit.c
branches/ge_components/source/blender/editors/space_text/text_draw.c
branches/ge_components/source/blender/editors/space_text/text_ops.c
branches/ge_components/source/blender/editors/space_view3d/space_view3d.c
branches/ge_components/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_components/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_components/source/blender/editors/space_view3d/view3d_header.c
branches/ge_components/source/blender/editors/space_view3d/view3d_select.c
branches/ge_components/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_components/source/blender/editors/space_view3d/view3d_view.c
branches/ge_components/source/blender/editors/transform/transform.c
branches/ge_components/source/blender/editors/transform/transform.h
branches/ge_components/source/blender/editors/transform/transform_conversions.c
branches/ge_components/source/blender/editors/transform/transform_manipulator.c
branches/ge_components/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/ge_components/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_components/source/blender/gpu/GPU_material.h
branches/ge_components/source/blender/gpu/intern/gpu_codegen.c
branches/ge_components/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/ge_components/source/blender/ikplugin/intern/ikplugin_api.c
branches/ge_components/source/blender/imbuf/IMB_imbuf.h
branches/ge_components/source/blender/imbuf/intern/colormanagement.c
branches/ge_components/source/blender/imbuf/intern/dds/BlockDXT.h
branches/ge_components/source/blender/imbuf/intern/dds/FlipDXT.cpp
branches/ge_components/source/blender/imbuf/intern/dds/Stream.h
branches/ge_components/source/blender/imbuf/intern/divers.c
branches/ge_components/source/blender/imbuf/intern/imageprocess.c
branches/ge_components/source/blender/imbuf/intern/indexer.c
branches/ge_components/source/blender/imbuf/intern/jp2.c
branches/ge_components/source/blender/imbuf/intern/jpeg.c
branches/ge_components/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ge_components/source/blender/imbuf/intern/openexr/openexr_stub.cpp
branches/ge_components/source/blender/imbuf/intern/png.c
branches/ge_components/source/blender/imbuf/intern/radiance_hdr.c
branches/ge_components/source/blender/imbuf/intern/readimage.c
branches/ge_components/source/blender/imbuf/intern/rectop.c
branches/ge_components/source/blender/imbuf/intern/scaling.c
branches/ge_components/source/blender/imbuf/intern/thumbs.c
branches/ge_components/source/blender/makesdna/DNA_curve_types.h
branches/ge_components/source/blender/makesdna/DNA_gpencil_types.h
branches/ge_components/source/blender/makesdna/DNA_modifier_types.h
branches/ge_components/source/blender/makesdna/DNA_movieclip_types.h
branches/ge_components/source/blender/makesdna/DNA_node_types.h
branches/ge_components/source/blender/makesdna/DNA_object_types.h
branches/ge_components/source/blender/makesdna/DNA_scene_types.h
branches/ge_components/source/blender/makesdna/DNA_sequence_types.h
branches/ge_components/source/blender/makesdna/DNA_tracking_types.h
branches/ge_components/source/blender/makesdna/DNA_userdef_types.h
branches/ge_components/source/blender/makesdna/intern/makesdna.c
branches/ge_components/source/blender/makesrna/intern/makesrna.c
branches/ge_components/source/blender/makesrna/intern/rna_access.c
branches/ge_components/source/blender/makesrna/intern/rna_action.c
branches/ge_components/source/blender/makesrna/intern/rna_animation.c
branches/ge_components/source/blender/makesrna/intern/rna_boid.c
branches/ge_components/source/blender/makesrna/intern/rna_brush.c
branches/ge_components/source/blender/makesrna/intern/rna_color.c
branches/ge_components/source/blender/makesrna/intern/rna_curve.c
branches/ge_components/source/blender/makesrna/intern/rna_mask.c
branches/ge_components/source/blender/makesrna/intern/rna_mesh.c
branches/ge_components/source/blender/makesrna/intern/rna_modifier.c
branches/ge_components/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_components/source/blender/makesrna/intern/rna_nodetree_types.h
branches/ge_components/source/blender/makesrna/intern/rna_object.c
branches/ge_components/source/blender/makesrna/intern/rna_object_force.c
branches/ge_components/source/blender/makesrna/intern/rna_particle.c
branches/ge_components/source/blender/makesrna/intern/rna_pose.c
branches/ge_components/source/blender/makesrna/intern/rna_render.c
branches/ge_components/source/blender/makesrna/intern/rna_scene.c
branches/ge_components/source/blender/makesrna/intern/rna_sequencer.c
branches/ge_components/source/blender/makesrna/intern/rna_sequencer_api.c
branches/ge_components/source/blender/makesrna/intern/rna_tracking.c
branches/ge_components/source/blender/makesrna/intern/rna_ui_api.c
branches/ge_components/source/blender/makesrna/intern/rna_userdef.c
branches/ge_components/source/blender/makesrna/intern/rna_wm.c
branches/ge_components/source/blender/makesrna/intern/rna_wm_api.c
branches/ge_components/source/blender/modifiers/intern/MOD_explode.c
branches/ge_components/source/blender/modifiers/intern/MOD_skin.c
branches/ge_components/source/blender/modifiers/intern/MOD_solidify.c
branches/ge_components/source/blender/nodes/CMakeLists.txt
branches/ge_components/source/blender/nodes/NOD_shader.h
branches/ge_components/source/blender/nodes/NOD_socket.h
branches/ge_components/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/ge_components/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/ge_components/source/blender/nodes/composite/nodes/node_composite_math.c
branches/ge_components/source/blender/nodes/intern/node_socket.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_math.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_script.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/ge_components/source/blender/python/generic/bgl.c
branches/ge_components/source/blender/python/generic/bpy_internal_import.c
branches/ge_components/source/blender/python/generic/idprop_py_api.c
branches/ge_components/source/blender/python/generic/py_capi_utils.c
branches/ge_components/source/blender/python/intern/bpy.c
branches/ge_components/source/blender/python/intern/bpy_rna.c
branches/ge_components/source/blender/python/intern/bpy_util.h
branches/ge_components/source/blender/python/mathutils/mathutils_Color.c
branches/ge_components/source/blender/python/mathutils/mathutils_Euler.c
branches/ge_components/source/blender/python/mathutils/mathutils_Matrix.c
branches/ge_components/source/blender/python/mathutils/mathutils_Quaternion.c
branches/ge_components/source/blender/python/mathutils/mathutils_Vector.c
branches/ge_components/source/blender/quicktime/quicktime_export.h
branches/ge_components/source/blender/render/extern/include/RE_engine.h
branches/ge_components/source/blender/render/extern/include/RE_pipeline.h
branches/ge_components/source/blender/render/intern/include/render_types.h
branches/ge_components/source/blender/render/intern/raytrace/rayobject_internal.h
branches/ge_components/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/ge_components/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/ge_components/source/blender/render/intern/source/convertblender.c
branches/ge_components/source/blender/render/intern/source/envmap.c
branches/ge_components/source/blender/render/intern/source/external_engine.c
branches/ge_components/source/blender/render/intern/source/initrender.c
branches/ge_components/source/blender/render/intern/source/pipeline.c
branches/ge_components/source/blender/render/intern/source/renderdatabase.c
branches/ge_components/source/blender/render/intern/source/shadbuf.c
branches/ge_components/source/blender/render/intern/source/sunsky.c
branches/ge_components/source/blender/render/intern/source/voxeldata.c
branches/ge_components/source/blender/windowmanager/WM_api.h
branches/ge_components/source/blender/windowmanager/intern/wm_draw.c
branches/ge_components/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_components/source/blender/windowmanager/intern/wm_files.c
branches/ge_components/source/blender/windowmanager/intern/wm_jobs.c
branches/ge_components/source/blender/windowmanager/intern/wm_keymap.c
branches/ge_components/source/blender/windowmanager/intern/wm_operators.c
branches/ge_components/source/blender/windowmanager/intern/wm_window.c
branches/ge_components/source/blenderplayer/CMakeLists.txt
branches/ge_components/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/ge_components/source/creator/CMakeLists.txt
branches/ge_components/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/ge_components/source/gameengine/BlenderRoutines/SConscript
branches/ge_components/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/ge_components/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/ge_components/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/ge_components/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_components/source/gameengine/Converter/CMakeLists.txt
branches/ge_components/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_components/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ge_components/source/gameengine/Converter/SConscript
branches/ge_components/source/gameengine/Expressions/IntValue.cpp
branches/ge_components/source/gameengine/Expressions/PyObjectPlus.cpp
branches/ge_components/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/ge_components/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/ge_components/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/ge_components/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/ge_components/source/gameengine/Ketsji/BL_Material.cpp
branches/ge_components/source/gameengine/Ketsji/BL_Material.h
branches/ge_components/source/gameengine/Ketsji/BL_Shader.cpp
branches/ge_components/source/gameengine/Ketsji/BL_Shader.h
branches/ge_components/source/gameengine/Ketsji/CMakeLists.txt
branches/ge_components/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ge_components/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_components/source/gameengine/Ketsji/KX_CharacterWrapper.h
branches/ge_components/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_components/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_components/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/ge_components/source/gameengine/Ketsji/KX_MeshProxy.h
branches/ge_components/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/ge_components/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/ge_components/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/ge_components/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/ge_components/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/ge_components/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_components/source/gameengine/Ketsji/KX_Scene.h
branches/ge_components/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/ge_components/source/gameengine/Ketsji/KX_SoundActuator.h
branches/ge_components/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/ge_components/source/gameengine/Ketsji/KX_VertexProxy.h
branches/ge_components/source/gameengine/Ketsji/SConscript
branches/ge_components/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/ge_components/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/ge_components/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/ge_components/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/ge_components/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/ge_components/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ge_components/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/ge_components/source/gameengine/Rasterizer/RAS_TexVert.h
branches/ge_components/source/gameengine/SceneGraph/SG_IObject.h
branches/ge_components/source/gameengine/VideoTexture/ImageRender.cpp
branches/ge_components/source/tools/check_style_c.py
branches/ge_components/source/tools/spell_check_source.py
Added Paths:
-----------
branches/ge_components/build_files/build_environment/
branches/ge_components/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
branches/ge_components/intern/audaspace/intern/AUD_Sequencer.cpp
branches/ge_components/intern/audaspace/intern/AUD_Sequencer.h
branches/ge_components/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/ge_components/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
branches/ge_components/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/ge_components/intern/cycles/kernel/shaders/node_normal_map.osl
branches/ge_components/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
branches/ge_components/intern/cycles/kernel/shaders/node_tangent.osl
branches/ge_components/intern/cycles/util/util_stats.h
branches/ge_components/intern/locale/
branches/ge_components/source/blender/blenlib/BLI_math_interp.h
branches/ge_components/source/blender/blenlib/intern/math_interp.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tangent.c
Removed Paths:
-------------
branches/ge_components/intern/audaspace/intern/AUD_Reference.h
branches/ge_components/intern/audaspace/intern/AUD_ReferenceHandler.cpp
Property Changed:
----------------
branches/ge_components/
branches/ge_components/source/blender/editors/interface/interface.c
branches/ge_components/source/blender/editors/space_outliner/
Property changes on: branches/ge_components
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bge_components:36315-36316,36318,36331,36389,36540
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:49306-51873
+ /branches/bge_components:36315-36316,36318,36331,36389,36540
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:49306-52165
Modified: branches/ge_components/CMakeLists.txt
===================================================================
--- branches/ge_components/CMakeLists.txt 2012-11-13 23:59:59 UTC (rev 52192)
+++ branches/ge_components/CMakeLists.txt 2012-11-14 00:06:12 UTC (rev 52193)
@@ -289,18 +289,14 @@
set(OSX_SYSTEM unsupported)
endif()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
- endif()
if(${CMAKE_GENERATOR} MATCHES "Xcode")
- ##### workaround for actual official cmake incompatibility with xcode 4.3 #####
+ ##### cmake incompatibility with xcode 4.3 and higher #####
if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
- message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
+ message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
endif()
- ### end workaround for actual official cmake incompatibility with xcode 4.3 ###
+ ### end cmake incompatibility with xcode 4.3 and higher ###
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
# Xcode 4 defaults to the Apple LLVM Compiler.
@@ -315,7 +311,28 @@
endif()
message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+
+ if(${XCODE_VERSION} VERSION_LESS 4.3)
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
+ else()
+ # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
+ # absolute pathes are more foolproof here !
+ set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+ endif()
+ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ endif()
+
+ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
+ # force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ endif()
+
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -336,12 +353,20 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_GAMEENGINE))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE)
+ if(WITH_OPENAL)
+ message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+ endif()
+ if(WITH_JACK)
+ message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+ endif()
+ if(WITH_GAMEENGINE)
+ message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+ endif()
endif()
if(NOT WITH_SDL AND WITH_GHOST_SDL)
- message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
endif()
if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
@@ -372,8 +397,8 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles and booleans
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
+# auto enable boost for cycles, booleans, audaspace or i18n
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
set(WITH_BOOST ON)
endif()
@@ -589,28 +614,6 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
- if(WITH_INTERNATIONAL)
- find_library(INTL_LIBRARY
- NAMES intl
- PATHS
- /sw/lib
- )
-
- find_library(ICONV_LIBRARY
- NAMES iconv
- PATHS
- /sw/lib
- )
- mark_as_advanced(
- ICONV_LIBRARY
- INTL_LIBRARY
- )
-
- if(INTL_LIBRARY AND ICONV_LIBRARY)
- set(GETTEXT_LIBRARIES ${INTL_LIBRARY} ${ICONV_LIBRARY})
- endif()
- endif()
-
if(WITH_FFTW3)
find_package(Fftw3)
if(NOT FFTW3_FOUND)
@@ -658,7 +661,11 @@
else()
set(Boost_USE_MULTITHREADED ON)
endif()
- find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+ set(__boost_packages filesystem regex system thread)
+ if (WITH_INTERNATIONAL)
+ list(APPEND __boost_packages locale)
+ endif()
+ find_package(Boost 1.34 COMPONENTS ${__boost_packages})
mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif()
@@ -715,7 +722,7 @@
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
set(LLVM_VERSION "3.0" CACHE STRING "Version of LLVM to use")
set(LLVM_STATIC YES)
- if(LLVM_DIRECTORY)
+ if(EXISTS "${LLVM_DIRECTORY}/bin/llvm-config")
set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
else()
set(LLVM_CONFIG llvm-config)
@@ -730,7 +737,7 @@
OUTPUT_VARIABLE LLVM_LIB_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
find_library(LLVM_LIBRARY
- NAMES libLLVMAnalysis.a # first of a whole bunch of libs to get
+ NAMES LLVMAnalysis # first of a whole bunch of libs to get
PATHS ${LLVM_LIB_DIR})
message(STATUS "LLVM version = ${LLVM_VERSION}")
message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
@@ -875,13 +882,6 @@
add_definitions(-DWIN32)
- if(WITH_INTERNATIONAL)
- set(ICONV ${LIBDIR}/iconv)
- set(ICONV_INCLUDE_DIRS ${ICONV}/include)
- set(ICONV_LIBRARIES iconv)
- set(ICONV_LIBPATH ${ICONV}/lib)
- endif()
-
set(JPEG "${LIBDIR}/jpeg")
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -974,13 +974,6 @@
set(CXX_WARNINGS "${_WARNINGS}")
unset(_WARNINGS)
- if(WITH_INTERNATIONAL)
- set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
- set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIBRARIES gnu_gettext)
- endif()
-
if(WITH_MOD_CLOTH_ELTOPO)
set(LAPACK ${LIBDIR}/lapack)
# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
@@ -1133,6 +1126,11 @@
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
debug libboost_regex-${BOOST_DEBUG_POSTFIX}
debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(WITH_INTERNATIONAL)
+ set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+ optimized libboost_locale-${BOOST_POSTFIX}
+ debug libboost_locale-${BOOST_DEBUG_POSTFIX})
+ endif(WITH_INTERNATIONAL)
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
@@ -1186,16 +1184,8 @@
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
-
add_definitions(-DFREE_WINDOWS)
- if(WITH_INTERNATIONAL)
- set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
- set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIBRARIES intl)
- endif()
-
set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
@@ -1313,6 +1303,11 @@
debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
boost_regex-${BOOST_DEBUG_POSTFIX}
boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+ if(WITH_INTERNATIONAL)
+ set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+ optimized boost_locale-${BOOST_POSTFIX}
+ debug boost_locale-${BOOST_DEBUG_POSTFIX})
+ endif()
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
endif()
@@ -1347,16 +1342,6 @@
set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE) # valid also for 10.6/10.7
endif()
- if(${XCODE_VERSION} VERSION_LESS 4.3)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
- else()
- # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
- # absolute pathes are more foolproof here !
- set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list