[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40836] branches/carve_booleans: svn merge ^/trunk/blender -r38278:40000

[Campbell Barton]

Revision: 40836
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40836
Author:   campbellbarton
Date:     2011-10-06 17:16:00 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r38278:40000

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

Modified Paths:
--------------
    branches/carve_booleans/CMakeLists.txt
    branches/carve_booleans/GNUmakefile
    branches/carve_booleans/SConstruct
    branches/carve_booleans/build_files/buildbot/config/user-config-i686.py
    branches/carve_booleans/build_files/buildbot/config/user-config-player-i686.py
    branches/carve_booleans/build_files/buildbot/config/user-config-player-x86_64.py
    branches/carve_booleans/build_files/buildbot/config/user-config-x86_64.py
    branches/carve_booleans/build_files/buildbot/master.cfg
    branches/carve_booleans/build_files/buildbot/slave_compile.py
    branches/carve_booleans/build_files/buildbot/slave_pack.py
    branches/carve_booleans/build_files/cmake/buildinfo.cmake
    branches/carve_booleans/build_files/cmake/cmake_consistency_check.py
    branches/carve_booleans/build_files/cmake/cmake_netbeans_project.py
    branches/carve_booleans/build_files/cmake/cmake_qtcreator_project.py
    branches/carve_booleans/build_files/cmake/macros.cmake
    branches/carve_booleans/build_files/cmake/packaging.cmake
    branches/carve_booleans/build_files/package_spec/rpm/blender.spec.in
    branches/carve_booleans/build_files/scons/config/darwin-config.py
    branches/carve_booleans/build_files/scons/config/linuxcross-config.py
    branches/carve_booleans/build_files/scons/config/win32-mingw-config.py
    branches/carve_booleans/build_files/scons/config/win32-vc-config.py
    branches/carve_booleans/build_files/scons/config/win64-vc-config.py
    branches/carve_booleans/build_files/scons/tools/Blender.py
    branches/carve_booleans/build_files/scons/tools/btools.py
    branches/carve_booleans/doc/build_systems/scons-dev.txt
    branches/carve_booleans/doc/build_systems/scons.txt
    branches/carve_booleans/doc/doxygen/Doxyfile
    branches/carve_booleans/doc/python_api/blender-org/static/default.css_t
    branches/carve_booleans/doc/python_api/examples/bge.constraints.py
    branches/carve_booleans/doc/python_api/examples/bge.texture.1.py
    branches/carve_booleans/doc/python_api/examples/bge.texture.py
    branches/carve_booleans/doc/python_api/examples/blf.py
    branches/carve_booleans/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/carve_booleans/doc/python_api/examples/mathutils.Vector.py
    branches/carve_booleans/doc/python_api/rst/bge.constraints.rst
    branches/carve_booleans/doc/python_api/rst/bge.events.rst
    branches/carve_booleans/doc/python_api/rst/bge.logic.rst
    branches/carve_booleans/doc/python_api/rst/bge.render.rst
    branches/carve_booleans/doc/python_api/rst/bge.texture.rst
    branches/carve_booleans/doc/python_api/rst/bge.types.rst
    branches/carve_booleans/doc/python_api/rst/bgl.rst
    branches/carve_booleans/doc/python_api/sphinx_doc_gen.py
    branches/carve_booleans/doc/python_api/sphinx_doc_gen.sh
    branches/carve_booleans/extern/binreloc/CMakeLists.txt
    branches/carve_booleans/extern/bullet2/src/SConscript
    branches/carve_booleans/extern/eltopo/CMakeLists.txt
    branches/carve_booleans/extern/eltopo/SConscript
    branches/carve_booleans/extern/glew/CMakeLists.txt
    branches/carve_booleans/extern/lzo/CMakeLists.txt
    branches/carve_booleans/intern/CMakeLists.txt
    branches/carve_booleans/intern/audaspace/CMakeLists.txt
    branches/carve_booleans/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_AccumulatorFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DelayFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DelayReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_DoubleFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DoubleFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DoubleReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_EffectFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_EffectFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_EffectReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_EffectReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_EnvelopeFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_FaderFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_FaderFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_FaderReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_HighpassFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_HighpassFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_IIRFilterFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_IIRFilterReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_IIRFilterReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_LimiterFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_LimiterFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_LimiterReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_LoopFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_LoopReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_PingPongFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_PitchFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_PitchReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_PitchReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_RectifyFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_RectifyFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_ReverseFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_ReverseReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_SquareFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_SquareFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_SumFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_SumFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_SuperposeFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_SuperposeFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_SuperposeReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_SuperposeReader.h
    branches/carve_booleans/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_VolumeFactory.h
    branches/carve_booleans/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/carve_booleans/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/carve_booleans/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/carve_booleans/intern/audaspace/Python/AUD_PyAPI.h
    branches/carve_booleans/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    branches/carve_booleans/intern/audaspace/SRC/AUD_SRCResampleFactory.h
    branches/carve_booleans/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
    branches/carve_booleans/intern/audaspace/SRC/AUD_SRCResampleReader.h
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/carve_booleans/intern/audaspace/fftw/AUD_BandPassReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_3DMath.h
    branches/carve_booleans/intern/audaspace/intern/AUD_Buffer.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_Buffer.h
    branches/carve_booleans/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_BufferReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_C-API.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_C-API.h
    branches/carve_booleans/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ChannelMapperReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ConverterFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_ConverterFunctions.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ConverterReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_FileFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_I3DDevice.h
    branches/carve_booleans/intern/audaspace/intern/AUD_IDevice.h
    branches/carve_booleans/intern/audaspace/intern/AUD_IFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_IReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_LinearResampleFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_LinearResampleReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_Mixer.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_Mixer.h
    branches/carve_booleans/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_MixerFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_NULLDevice.h
    branches/carve_booleans/intern/audaspace/intern/AUD_ReadDevice.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ReadDevice.h
    branches/carve_booleans/intern/audaspace/intern/AUD_Reference.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SilenceFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SilenceFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SilenceReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SilenceReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SinusFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SinusReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SinusReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/carve_booleans/intern/audaspace/intern/AUD_Space.h
    branches/carve_booleans/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/carve_booleans/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/carve_booleans/intern/audaspace/jack/AUD_JackDevice.h
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/carve_booleans/intern/boolop/CMakeLists.txt
    branches/carve_booleans/intern/bsp/CMakeLists.txt
    branches/carve_booleans/intern/ffmpeg/ffmpeg_compat.h
    branches/carve_booleans/intern/ghost/CMakeLists.txt
    branches/carve_booleans/intern/ghost/GHOST_C-api.h
    branches/carve_booleans/intern/ghost/GHOST_ISystem.h
    branches/carve_booleans/intern/ghost/GHOST_Types.h
    branches/carve_booleans/intern/ghost/SConscript
    branches/carve_booleans/intern/ghost/intern/GHOST_C-api.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_Debug.h
    branches/carve_booleans/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_DropTargetWin32.h
    branches/carve_booleans/intern/ghost/intern/GHOST_EventManager.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_EventNDOF.h
    branches/carve_booleans/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_EventPrinter.h
    branches/carve_booleans/intern/ghost/intern/GHOST_ISystem.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManager.h
    branches/carve_booleans/intern/ghost/intern/GHOST_Path-api.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_System.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_System.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemWin32.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemX11.h
    branches/carve_booleans/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/carve_booleans/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_WindowWin32.h
    branches/carve_booleans/intern/guardedalloc/MEM_sys_types.h
    branches/carve_booleans/intern/guardedalloc/intern/mallocn.c
    branches/carve_booleans/intern/iksolver/intern/IK_QSegment.cpp
    branches/carve_booleans/intern/itasc/kdl/frames_io.cpp
    branches/carve_booleans/intern/mikktspace/mikktspace.c
    branches/carve_booleans/intern/opennl/CMakeLists.txt
    branches/carve_booleans/intern/opennl/superlu/superlu_sys_types.h
    branches/carve_booleans/intern/smoke/CMakeLists.txt
    branches/carve_booleans/intern/smoke/SConscript
    branches/carve_booleans/intern/smoke/intern/FFT_NOISE.h
    branches/carve_booleans/intern/smoke/intern/WTURBULENCE.cpp
    branches/carve_booleans/release/datafiles/blenderbuttons
    branches/carve_booleans/release/datafiles/splash.png
    branches/carve_booleans/release/scripts/modules/addon_utils.py
    branches/carve_booleans/release/scripts/modules/bpy/__init__.py
    branches/carve_booleans/release/scripts/modules/bpy/ops.py
    branches/carve_booleans/release/scripts/modules/bpy/path.py
    branches/carve_booleans/release/scripts/modules/bpy/utils.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/__init__.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/image_utils.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/io_utils.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/object_utils.py
    branches/carve_booleans/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/carve_booleans/release/scripts/modules/bpy_types.py
    branches/carve_booleans/release/scripts/modules/bpyml.py
    branches/carve_booleans/release/scripts/modules/bpyml_ui.py
    branches/carve_booleans/release/scripts/modules/console_python.py
    branches/carve_booleans/release/scripts/modules/keyingsets_utils.py
    branches/carve_booleans/release/scripts/modules/rna_info.py
    branches/carve_booleans/release/scripts/modules/rna_prop_ui.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/DV.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/DVD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/SVCD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/VCD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/xvid.py
    branches/carve_booleans/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/carve_booleans/release/scripts/startup/bl_operators/animsys_update.py
    branches/carve_booleans/release/scripts/startup/bl_operators/image.py
    branches/carve_booleans/release/scripts/startup/bl_operators/mesh.py
    branches/carve_booleans/release/scripts/startup/bl_operators/nla.py
    branches/carve_booleans/release/scripts/startup/bl_operators/object.py
    branches/carve_booleans/release/scripts/startup/bl_operators/object_align.py
    branches/carve_booleans/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/carve_booleans/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/carve_booleans/release/scripts/startup/bl_operators/presets.py
    branches/carve_booleans/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/carve_booleans/release/scripts/startup/bl_operators/sequencer.py
    branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/carve_booleans/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/carve_booleans/release/scripts/startup/bl_operators/wm.py
    branches/carve_booleans/release/scripts/startup/bl_ui/__init__.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_animviz.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_game.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_material.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_object.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_particle.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_render.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_scene.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_texture.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_world.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_console.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_filebrowser.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_image.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_info.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_logic.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_node.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_outliner.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_text.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/carve_booleans/release/scripts/startup/keyingsets_builtins.py
    branches/carve_booleans/release/scripts/templates/addon_add_object.py
    branches/carve_booleans/release/scripts/templates/operator_export.py
    branches/carve_booleans/release/scripts/templates/operator_mesh_add.py
    branches/carve_booleans/release/scripts/templates/operator_modal.py
    branches/carve_booleans/release/scripts/templates/operator_modal_draw.py
    branches/carve_booleans/release/scripts/templates/operator_modal_timer.py
    branches/carve_booleans/release/scripts/templates/operator_modal_view3d.py
    branches/carve_booleans/release/scripts/templates/operator_simple.py
    branches/carve_booleans/release/text/readme.html
    branches/carve_booleans/source/blender/CMakeLists.txt
    branches/carve_booleans/source/blender/avi/AVI_avi.h
    branches/carve_booleans/source/blender/avi/CMakeLists.txt
    branches/carve_booleans/source/blender/avi/intern/avi.c
    branches/carve_booleans/source/blender/blenfont/CMakeLists.txt
    branches/carve_booleans/source/blender/blenfont/intern/blf.c
    branches/carve_booleans/source/blender/blenfont/intern/blf_font.c
    branches/carve_booleans/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/carve_booleans/source/blender/blenkernel/BKE_action.h
    branches/carve_booleans/source/blender/blenkernel/BKE_anim.h
    branches/carve_booleans/source/blender/blenkernel/BKE_animsys.h
    branches/carve_booleans/source/blender/blenkernel/BKE_armature.h
    branches/carve_booleans/source/blender/blenkernel/BKE_blender.h
    branches/carve_booleans/source/blender/blenkernel/BKE_constraint.h
    branches/carve_booleans/source/blender/blenkernel/BKE_curve.h
    branches/carve_booleans/source/blender/blenkernel/BKE_effect.h
    branches/carve_booleans/source/blender/blenkernel/BKE_fcurve.h
    branches/carve_booleans/source/blender/blenkernel/BKE_global.h
    branches/carve_booleans/source/blender/blenkernel/BKE_image.h
    branches/carve_booleans/source/blender/blenkernel/BKE_library.h
    branches/carve_booleans/source/blender/blenkernel/BKE_main.h
    branches/carve_booleans/source/blender/blenkernel/BKE_material.h
    branches/carve_booleans/source/blender/blenkernel/BKE_modifier.h
    branches/carve_booleans/source/blender/blenkernel/BKE_nla.h
    branches/carve_booleans/source/blender/blenkernel/BKE_node.h
    branches/carve_booleans/source/blender/blenkernel/BKE_sequencer.h
    branches/carve_booleans/source/blender/blenkernel/BKE_sound.h
    branches/carve_booleans/source/blender/blenkernel/CMakeLists.txt
    branches/carve_booleans/source/blender/blenkernel/SConscript
    branches/carve_booleans/source/blender/blenkernel/intern/DerivedMesh.c
    branches/carve_booleans/source/blender/blenkernel/intern/action.c
    branches/carve_booleans/source/blender/blenkernel/intern/anim.c
    branches/carve_booleans/source/blender/blenkernel/intern/anim_sys.c
    branches/carve_booleans/source/blender/blenkernel/intern/armature.c
    branches/carve_booleans/source/blender/blenkernel/intern/blender.c
    branches/carve_booleans/source/blender/blenkernel/intern/boids.c
    branches/carve_booleans/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/carve_booleans/source/blender/blenkernel/intern/cloth.c
    branches/carve_booleans/source/blender/blenkernel/intern/collision.c
    branches/carve_booleans/source/blender/blenkernel/intern/constraint.c
    branches/carve_booleans/source/blender/blenkernel/intern/curve.c
    branches/carve_booleans/source/blender/blenkernel/intern/customdata.c
    branches/carve_booleans/source/blender/blenkernel/intern/depsgraph.c
    branches/carve_booleans/source/blender/blenkernel/intern/displist.c
    branches/carve_booleans/source/blender/blenkernel/intern/effect.c
    branches/carve_booleans/source/blender/blenkernel/intern/fcurve.c
    branches/carve_booleans/source/blender/blenkernel/intern/fmodifier.c
    branches/carve_booleans/source/blender/blenkernel/intern/gpencil.c
    branches/carve_booleans/source/blender/blenkernel/intern/idcode.c
    branches/carve_booleans/source/blender/blenkernel/intern/image.c
    branches/carve_booleans/source/blender/blenkernel/intern/ipo.c
    branches/carve_booleans/source/blender/blenkernel/intern/key.c
    branches/carve_booleans/source/blender/blenkernel/intern/library.c
    branches/carve_booleans/source/blender/blenkernel/intern/material.c
    branches/carve_booleans/source/blender/blenkernel/intern/mesh.c
    branches/carve_booleans/source/blender/blenkernel/intern/mesh_validate.c
    branches/carve_booleans/source/blender/blenkernel/intern/modifier.c
    branches/carve_booleans/source/blender/blenkernel/intern/multires.c
    branches/carve_booleans/source/blender/blenkernel/intern/nla.c
    branches/carve_booleans/source/blender/blenkernel/intern/node.c
    branches/carve_booleans/source/blender/blenkernel/intern/object.c
    branches/carve_booleans/source/blender/blenkernel/intern/particle.c
    branches/carve_booleans/source/blender/blenkernel/intern/particle_system.c
    branches/carve_booleans/source/blender/blenkernel/intern/pointcache.c
    branches/carve_booleans/source/blender/blenkernel/intern/report.c
    branches/carve_booleans/source/blender/blenkernel/intern/scene.c
    branches/carve_booleans/source/blender/blenkernel/intern/seqeffects.c
    branches/carve_booleans/source/blender/blenkernel/intern/sequencer.c
    branches/carve_booleans/source/blender/blenkernel/intern/smoke.c
    branches/carve_booleans/source/blender/blenkernel/intern/sound.c
    branches/carve_booleans/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/carve_booleans/source/blender/blenkernel/intern/text.c
    branches/carve_booleans/source/blender/blenkernel/intern/texture.c
    branches/carve_booleans/source/blender/blenkernel/intern/unit.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeavi.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeffmpeg.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeframeserver.c
    branches/carve_booleans/source/blender/blenlib/BLI_callbacks.h
    branches/carve_booleans/source/blender/blenlib/BLI_ghash.h
    branches/carve_booleans/source/blender/blenlib/BLI_math_inline.h
    branches/carve_booleans/source/blender/blenlib/BLI_math_matrix.h
    branches/carve_booleans/source/blender/blenlib/BLI_math_rotation.h
    branches/carve_booleans/source/blender/blenlib/BLI_math_vector.h
    branches/carve_booleans/source/blender/blenlib/BLI_string.h
    branches/carve_booleans/source/blender/blenlib/BLI_utildefines.h
    branches/carve_booleans/source/blender/blenlib/CMakeLists.txt
    branches/carve_booleans/source/blender/blenlib/intern/BLI_args.c
    branches/carve_booleans/source/blender/blenlib/intern/BLI_ghash.c
    branches/carve_booleans/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/carve_booleans/source/blender/blenlib/intern/BLI_kdtree.c
    branches/carve_booleans/source/blender/blenlib/intern/callbacks.c
    branches/carve_booleans/source/blender/blenlib/intern/fileops.c
    branches/carve_booleans/source/blender/blenlib/intern/graph.c
    branches/carve_booleans/source/blender/blenlib/intern/jitter.c
    branches/carve_booleans/source/blender/blenlib/intern/math_geom.c
    branches/carve_booleans/source/blender/blenlib/intern/math_matrix.c
    branches/carve_booleans/source/blender/blenlib/intern/math_rotation.c
    branches/carve_booleans/source/blender/blenlib/intern/math_vector.c
    branches/carve_booleans/source/blender/blenlib/intern/math_vector_inline.c
    branches/carve_booleans/source/blender/blenlib/intern/noise.c
    branches/carve_booleans/source/blender/blenlib/intern/path_util.c
    branches/carve_booleans/source/blender/blenlib/intern/pbvh.c
    branches/carve_booleans/source/blender/blenlib/intern/rct.c
    branches/carve_booleans/source/blender/blenlib/intern/scanfill.c
    branches/carve_booleans/source/blender/blenlib/intern/storage.c
    branches/carve_booleans/source/blender/blenlib/intern/string.c
    branches/carve_booleans/source/blender/blenloader/BLO_readfile.h
    branches/carve_booleans/source/blender/blenloader/BLO_sys_types.h
    branches/carve_booleans/source/blender/blenloader/CMakeLists.txt
    branches/carve_booleans/source/blender/blenloader/SConscript
    branches/carve_booleans/source/blender/blenloader/intern/readblenentry.c
    branches/carve_booleans/source/blender/blenloader/intern/readfile.c
    branches/carve_booleans/source/blender/blenloader/intern/writefile.c
    branches/carve_booleans/source/blender/blenpluginapi/CMakeLists.txt
    branches/carve_booleans/source/blender/blenpluginapi/SConscript
    branches/carve_booleans/source/blender/blenpluginapi/iff.h
    branches/carve_booleans/source/blender/collada/AnimationImporter.cpp
    branches/carve_booleans/source/blender/collada/AnimationImporter.h
    branches/carve_booleans/source/blender/collada/ArmatureExporter.cpp
    branches/carve_booleans/source/blender/collada/ArmatureExporter.h
    branches/carve_booleans/source/blender/collada/ArmatureImporter.cpp
    branches/carve_booleans/source/blender/collada/ArmatureImporter.h
    branches/carve_booleans/source/blender/collada/CMakeLists.txt
    branches/carve_booleans/source/blender/collada/CameraExporter.cpp
    branches/carve_booleans/source/blender/collada/DocumentExporter.cpp
    branches/carve_booleans/source/blender/collada/DocumentImporter.cpp
    branches/carve_booleans/source/blender/collada/DocumentImporter.h
    branches/carve_booleans/source/blender/collada/EffectExporter.cpp
    branches/carve_booleans/source/blender/collada/ExtraHandler.cpp
    branches/carve_booleans/source/blender/collada/ExtraHandler.h
    branches/carve_booleans/source/blender/collada/ExtraTags.cpp
    branches/carve_booleans/source/blender/collada/GeometryExporter.h
    branches/carve_booleans/source/blender/collada/LightExporter.cpp
    branches/carve_booleans/source/blender/collada/MaterialExporter.cpp
    branches/carve_booleans/source/blender/collada/MaterialExporter.h
    branches/carve_booleans/source/blender/collada/MeshImporter.cpp
    branches/carve_booleans/source/blender/collada/SConscript
    branches/carve_booleans/source/blender/collada/SkinInfo.cpp
    branches/carve_booleans/source/blender/collada/TransformReader.cpp
    branches/carve_booleans/source/blender/collada/TransformWriter.cpp
    branches/carve_booleans/source/blender/collada/collada.cpp
    branches/carve_booleans/source/blender/editors/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/animation/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/animation/anim_channels_defines.c
    branches/carve_booleans/source/blender/editors/animation/anim_channels_edit.c
    branches/carve_booleans/source/blender/editors/animation/anim_deps.c
    branches/carve_booleans/source/blender/editors/animation/anim_draw.c
    branches/carve_booleans/source/blender/editors/animation/anim_filter.c
    branches/carve_booleans/source/blender/editors/animation/anim_intern.h
    branches/carve_booleans/source/blender/editors/animation/anim_ipo_utils.c
    branches/carve_booleans/source/blender/editors/animation/anim_markers.c
    branches/carve_booleans/source/blender/editors/animation/anim_ops.c
    branches/carve_booleans/source/blender/editors/animation/drivers.c
    branches/carve_booleans/source/blender/editors/animation/fmodifier_ui.c
    branches/carve_booleans/source/blender/editors/animation/keyframes_draw.c
    branches/carve_booleans/source/blender/editors/animation/keyframes_edit.c
    branches/carve_booleans/source/blender/editors/animation/keyframes_general.c
    branches/carve_booleans/source/blender/editors/animation/keyframing.c
    branches/carve_booleans/source/blender/editors/animation/keyingsets.c
    branches/carve_booleans/source/blender/editors/armature/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/armature/SConscript
    branches/carve_booleans/source/blender/editors/armature/armature_intern.h
    branches/carve_booleans/source/blender/editors/armature/armature_ops.c
    branches/carve_booleans/source/blender/editors/armature/editarmature.c
    branches/carve_booleans/source/blender/editors/armature/poseSlide.c
    branches/carve_booleans/source/blender/editors/armature/poseUtils.c
    branches/carve_booleans/source/blender/editors/armature/poselib.c
    branches/carve_booleans/source/blender/editors/armature/poseobject.c
    branches/carve_booleans/source/blender/editors/curve/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/curve/editcurve.c
    branches/carve_booleans/source/blender/editors/curve/editfont.c
    branches/carve_booleans/source/blender/editors/datafiles/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/datafiles/blenderbuttons.c
    branches/carve_booleans/source/blender/editors/datafiles/preview.blend.c
    branches/carve_booleans/source/blender/editors/datafiles/splash.png.c
    branches/carve_booleans/source/blender/editors/datafiles/startup.blend.c
    branches/carve_booleans/source/blender/editors/gpencil/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/gpencil/drawgpencil.c
    branches/carve_booleans/source/blender/editors/gpencil/editaction_gpencil.c
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_buttons.c
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_edit.c
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_intern.h
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_ops.c
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_paint.c
    branches/carve_booleans/source/blender/editors/include/BIF_glutil.h
    branches/carve_booleans/source/blender/editors/include/ED_anim_api.h
    branches/carve_booleans/source/blender/editors/include/ED_gpencil.h
    branches/carve_booleans/source/blender/editors/include/ED_keyframes_draw.h
    branches/carve_booleans/source/blender/editors/include/ED_keyframes_edit.h
    branches/carve_booleans/source/blender/editors/include/ED_keyframing.h
    branches/carve_booleans/source/blender/editors/include/ED_markers.h
    branches/carve_booleans/source/blender/editors/include/ED_node.h
    branches/carve_booleans/source/blender/editors/include/ED_object.h
    branches/carve_booleans/source/blender/editors/include/ED_sequencer.h
    branches/carve_booleans/source/blender/editors/include/ED_transform.h
    branches/carve_booleans/source/blender/editors/include/ED_view3d.h
    branches/carve_booleans/source/blender/editors/include/UI_icons.h
    branches/carve_booleans/source/blender/editors/include/UI_interface.h
    branches/carve_booleans/source/blender/editors/include/UI_resources.h
    branches/carve_booleans/source/blender/editors/interface/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/interface/interface.c
    branches/carve_booleans/source/blender/editors/interface/interface_anim.c
    branches/carve_booleans/source/blender/editors/interface/interface_draw.c
    branches/carve_booleans/source/blender/editors/interface/interface_handlers.c
    branches/carve_booleans/source/blender/editors/interface/interface_icons.c
    branches/carve_booleans/source/blender/editors/interface/interface_intern.h
    branches/carve_booleans/source/blender/editors/interface/interface_layout.c
    branches/carve_booleans/source/blender/editors/interface/interface_panel.c
    branches/carve_booleans/source/blender/editors/interface/interface_regions.c
    branches/carve_booleans/source/blender/editors/interface/interface_style.c
    branches/carve_booleans/source/blender/editors/interface/interface_templates.c
    branches/carve_booleans/source/blender/editors/interface/interface_utils.c
    branches/carve_booleans/source/blender/editors/interface/interface_widgets.c
    branches/carve_booleans/source/blender/editors/interface/resources.c
    branches/carve_booleans/source/blender/editors/mesh/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/mesh/SConscript
    branches/carve_booleans/source/blender/editors/mesh/editmesh.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh_lib.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh_mods.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh_tools.c
    branches/carve_booleans/source/blender/editors/metaball/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/object/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/object/SConscript
    branches/carve_booleans/source/blender/editors/object/object_add.c
    branches/carve_booleans/source/blender/editors/object/object_bake.c
    branches/carve_booleans/source/blender/editors/object/object_constraint.c
    branches/carve_booleans/source/blender/editors/object/object_edit.c
    branches/carve_booleans/source/blender/editors/object/object_intern.h
    branches/carve_booleans/source/blender/editors/object/object_modifier.c
    branches/carve_booleans/source/blender/editors/object/object_ops.c
    branches/carve_booleans/source/blender/editors/object/object_relations.c
    branches/carve_booleans/source/blender/editors/object/object_select.c
    branches/carve_booleans/source/blender/editors/object/object_transform.c
    branches/carve_booleans/source/blender/editors/physics/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/physics/SConscript
    branches/carve_booleans/source/blender/editors/physics/particle_edit.c
    branches/carve_booleans/source/blender/editors/physics/physics_fluid.c
    branches/carve_booleans/source/blender/editors/physics/physics_pointcache.c
    branches/carve_booleans/source/blender/editors/render/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/render/SConscript
    branches/carve_booleans/source/blender/editors/render/render_preview.c
    branches/carve_booleans/source/blender/editors/render/render_shading.c
    branches/carve_booleans/source/blender/editors/render/render_update.c
    branches/carve_booleans/source/blender/editors/screen/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/screen/SConscript
    branches/carve_booleans/source/blender/editors/screen/area.c
    branches/carve_booleans/source/blender/editors/screen/glutil.c
    branches/carve_booleans/source/blender/editors/screen/screen_edit.c
    branches/carve_booleans/source/blender/editors/screen/screen_ops.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/sculpt_paint/SConscript
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_image.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt.c
    branches/carve_booleans/source/blender/editors/sound/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/sound/sound_ops.c
    branches/carve_booleans/source/blender/editors/space_action/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_action/action_draw.c
    branches/carve_booleans/source/blender/editors/space_action/action_edit.c
    branches/carve_booleans/source/blender/editors/space_action/action_intern.h
    branches/carve_booleans/source/blender/editors/space_action/action_ops.c
    branches/carve_booleans/source/blender/editors/space_action/action_select.c
    branches/carve_booleans/source/blender/editors/space_action/space_action.c
    branches/carve_booleans/source/blender/editors/space_api/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_buttons/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_buttons/buttons_context.c
    branches/carve_booleans/source/blender/editors/space_buttons/buttons_header.c
    branches/carve_booleans/source/blender/editors/space_buttons/space_buttons.c
    branches/carve_booleans/source/blender/editors/space_console/console_ops.c
    branches/carve_booleans/source/blender/editors/space_console/space_console.c
    branches/carve_booleans/source/blender/editors/space_file/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_file/SConscript
    branches/carve_booleans/source/blender/editors/space_file/file_ops.c
    branches/carve_booleans/source/blender/editors/space_file/filelist.c
    branches/carve_booleans/source/blender/editors/space_file/fsmenu.c
    branches/carve_booleans/source/blender/editors/space_graph/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_graph/graph_buttons.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_draw.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_edit.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_ops.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_select.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_utils.c
    branches/carve_booleans/source/blender/editors/space_graph/space_graph.c
    branches/carve_booleans/source/blender/editors/space_image/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_image/image_buttons.c
    branches/carve_booleans/source/blender/editors/space_image/image_intern.h
    branches/carve_booleans/source/blender/editors/space_image/image_ops.c
    branches/carve_booleans/source/blender/editors/space_image/space_image.c
    branches/carve_booleans/source/blender/editors/space_info/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_info/info_ops.c
    branches/carve_booleans/source/blender/editors/space_logic/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_logic/logic_ops.c
    branches/carve_booleans/source/blender/editors/space_logic/logic_window.c
    branches/carve_booleans/source/blender/editors/space_nla/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_nla/nla_buttons.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_channels.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_draw.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_edit.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_intern.h
    branches/carve_booleans/source/blender/editors/space_nla/nla_ops.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_select.c
    branches/carve_booleans/source/blender/editors/space_nla/space_nla.c
    branches/carve_booleans/source/blender/editors/space_node/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_node/SConscript
    branches/carve_booleans/source/blender/editors/space_node/drawnode.c
    branches/carve_booleans/source/blender/editors/space_node/node_buttons.c
    branches/carve_booleans/source/blender/editors/space_node/node_draw.c
    branches/carve_booleans/source/blender/editors/space_node/node_edit.c
    branches/carve_booleans/source/blender/editors/space_node/node_header.c
    branches/carve_booleans/source/blender/editors/space_node/node_intern.h
    branches/carve_booleans/source/blender/editors/space_node/node_ops.c
    branches/carve_booleans/source/blender/editors/space_node/node_select.c
    branches/carve_booleans/source/blender/editors/space_node/node_state.c
    branches/carve_booleans/source/blender/editors/space_node/space_node.c
    branches/carve_booleans/source/blender/editors/space_outliner/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_intern.h
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_ops.c
    branches/carve_booleans/source/blender/editors/space_outliner/space_outliner.c
    branches/carve_booleans/source/blender/editors/space_script/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_sequencer/SConscript
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_add.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_select.c
    branches/carve_booleans/source/blender/editors/space_sequencer/space_sequencer.c
    branches/carve_booleans/source/blender/editors/space_sound/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_text/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_text/space_text.c
    branches/carve_booleans/source/blender/editors/space_text/text_draw.c
    branches/carve_booleans/source/blender/editors/space_text/text_intern.h
    branches/carve_booleans/source/blender/editors/space_text/text_ops.c
    branches/carve_booleans/source/blender/editors/space_text/text_python.c
    branches/carve_booleans/source/blender/editors/space_time/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_time/space_time.c
    branches/carve_booleans/source/blender/editors/space_time/time_intern.h
    branches/carve_booleans/source/blender/editors/space_time/time_ops.c
    branches/carve_booleans/source/blender/editors/space_userpref/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_view3d/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/space_view3d/drawanimviz.c
    branches/carve_booleans/source/blender/editors/space_view3d/drawarmature.c
    branches/carve_booleans/source/blender/editors/space_view3d/drawmesh.c
    branches/carve_booleans/source/blender/editors/space_view3d/drawobject.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_buttons.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_draw.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_edit.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_fly.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_header.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_intern.h
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_ops.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_select.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_view.c
    branches/carve_booleans/source/blender/editors/transform/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/transform/transform.c
    branches/carve_booleans/source/blender/editors/transform/transform.h
    branches/carve_booleans/source/blender/editors/transform/transform_conversions.c
    branches/carve_booleans/source/blender/editors/transform/transform_generics.c
    branches/carve_booleans/source/blender/editors/transform/transform_ops.c
    branches/carve_booleans/source/blender/editors/transform/transform_snap.c
    branches/carve_booleans/source/blender/editors/util/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/util/undo.c
    branches/carve_booleans/source/blender/editors/uvedit/CMakeLists.txt
    branches/carve_booleans/source/blender/editors/uvedit/uvedit_ops.c
    branches/carve_booleans/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/carve_booleans/source/blender/gpu/CMakeLists.txt
    branches/carve_booleans/source/blender/gpu/GPU_extensions.h
    branches/carve_booleans/source/blender/gpu/SConscript
    branches/carve_booleans/source/blender/gpu/intern/gpu_codegen.c
    branches/carve_booleans/source/blender/gpu/intern/gpu_draw.c
    branches/carve_booleans/source/blender/gpu/intern/gpu_extensions.c
    branches/carve_booleans/source/blender/gpu/intern/gpu_material.c
    branches/carve_booleans/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/carve_booleans/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/carve_booleans/source/blender/ikplugin/CMakeLists.txt
    branches/carve_booleans/source/blender/imbuf/CMakeLists.txt
    branches/carve_booleans/source/blender/imbuf/IMB_imbuf.h
    branches/carve_booleans/source/blender/imbuf/intern/IMB_anim.h
    branches/carve_booleans/source/blender/imbuf/intern/allocimbuf.c
    branches/carve_booleans/source/blender/imbuf/intern/anim_movie.c
    branches/carve_booleans/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/carve_booleans/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/carve_booleans/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/carve_booleans/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/carve_booleans/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/carve_booleans/source/blender/imbuf/intern/filter.c
    branches/carve_booleans/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/carve_booleans/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/carve_booleans/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/carve_booleans/source/blender/imbuf/intern/rectop.c
    branches/carve_booleans/source/blender/imbuf/intern/thumbs.c
    branches/carve_booleans/source/blender/imbuf/intern/tiff.c
    branches/carve_booleans/source/blender/imbuf/intern/util.c
    branches/carve_booleans/source/blender/imbuf/intern/writeimage.c
    branches/carve_booleans/source/blender/makesdna/DNA_ID.h
    branches/carve_booleans/source/blender/makesdna/DNA_action_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_actuator_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_anim_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_armature_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_constraint_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_curve_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_gpencil_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_image_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_ipo_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_modifier_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_nla_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_node_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_object_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_particle_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_scene_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_sdna_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_sequence_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_sound_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_space_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_texture_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_userdef_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_view3d_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_windowmanager_types.h
    branches/carve_booleans/source/blender/makesdna/intern/CMakeLists.txt
    branches/carve_booleans/source/blender/makesdna/intern/SConscript
    branches/carve_booleans/source/blender/makesdna/intern/dna_genfile.c
    branches/carve_booleans/source/blender/makesdna/intern/makesdna.c
    branches/carve_booleans/source/blender/makesrna/RNA_access.h
    branches/carve_booleans/source/blender/makesrna/RNA_enum_types.h
    branches/carve_booleans/source/blender/makesrna/RNA_types.h
    branches/carve_booleans/source/blender/makesrna/SConscript
    branches/carve_booleans/source/blender/makesrna/intern/CMakeLists.txt
    branches/carve_booleans/source/blender/makesrna/intern/SConscript
    branches/carve_booleans/source/blender/makesrna/intern/makesrna.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_ID.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_access.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_action.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_actuator.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_animation.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_animation_api.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_animviz.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_armature.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_cloth.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_constraint.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_curve.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_define.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_fcurve.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_fluidsim.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_gpencil.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_image.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_internal.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_main.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_main_api.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_modifier.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_nla.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_object.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_object_api.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_object_force.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_particle.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_pose.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_rna.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_scene.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_scene_api.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_screen.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_sensor.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_sequencer.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_smoke.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_sound.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_space.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_texture.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_userdef.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_wm.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_wm_api.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_world.c
    branches/carve_booleans/source/blender/modifiers/CMakeLists.txt
    branches/carve_booleans/source/blender/modifiers/MOD_modifiertypes.h
    branches/carve_booleans/source/blender/modifiers/SConscript
    branches/carve_booleans/source/blender/modifiers/intern/MOD_armature.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_array.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_bevel.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_boolean.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_build.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_cast.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_cloth.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_collision.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_curve.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_decimate.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_displace.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_explode.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_hook.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_lattice.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_mask.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_mirror.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_multires.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_none.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_screw.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_shapekey.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_smoke.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_smooth.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_softbody.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_solidify.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_subsurf.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_surface.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_util.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_util.h
    branches/carve_booleans/source/blender/modifiers/intern/MOD_uvproject.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_warp.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_wave.c
    branches/carve_booleans/source/blender/nodes/CMakeLists.txt
    branches/carve_booleans/source/blender/nodes/SConscript
    branches/carve_booleans/source/blender/nodes/intern/node_util.c
    branches/carve_booleans/source/blender/nodes/intern/node_util.h
    branches/carve_booleans/source/blender/python/CMakeLists.txt
    branches/carve_booleans/source/blender/python/SConscript
    branches/carve_booleans/source/blender/python/generic/CMakeLists.txt
    branches/carve_booleans/source/blender/python/generic/bgl.c
    branches/carve_booleans/source/blender/python/generic/bpy_internal_import.c
    branches/carve_booleans/source/blender/python/generic/noise_py_api.c
    branches/carve_booleans/source/blender/python/generic/py_capi_utils.c
    branches/carve_booleans/source/blender/python/intern/CMakeLists.txt
    branches/carve_booleans/source/blender/python/intern/bpy.c
    branches/carve_booleans/source/blender/python/intern/bpy_app_handlers.c
    branches/carve_booleans/source/blender/python/intern/bpy_driver.c
    branches/carve_booleans/source/blender/python/intern/bpy_interface.c
    branches/carve_booleans/source/blender/python/intern/bpy_intern_string.c
    branches/carve_booleans/source/blender/python/intern/bpy_library.c
    branches/carve_booleans/source/blender/python/intern/bpy_operator.c
    branches/carve_booleans/source/blender/python/intern/bpy_props.c
    branches/carve_booleans/source/blender/python/intern/bpy_rna.c
    branches/carve_booleans/source/blender/python/intern/bpy_rna.h
    branches/carve_booleans/source/blender/python/intern/bpy_rna_anim.c
    branches/carve_booleans/source/blender/python/intern/bpy_rna_array.c
    branches/carve_booleans/source/blender/python/intern/bpy_traceback.c
    branches/carve_booleans/source/blender/python/intern/bpy_util.h
    branches/carve_booleans/source/blender/quicktime/CMakeLists.txt
    branches/carve_booleans/source/blender/render/CMakeLists.txt
    branches/carve_booleans/source/blender/render/SConscript
    branches/carve_booleans/source/blender/render/extern/include/RE_pipeline.h
    branches/carve_booleans/source/blender/render/intern/source/convertblender.c
    branches/carve_booleans/source/blender/render/intern/source/envmap.c
    branches/carve_booleans/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/carve_booleans/source/blender/render/intern/source/initrender.c
    branches/carve_booleans/source/blender/render/intern/source/occlusion.c
    branches/carve_booleans/source/blender/render/intern/source/pipeline.c
    branches/carve_booleans/source/blender/render/intern/source/pixelblending.c
    branches/carve_booleans/source/blender/render/intern/source/pixelshading.c
    branches/carve_booleans/source/blender/render/intern/source/pointdensity.c
    branches/carve_booleans/source/blender/render/intern/source/rayshade.c
    branches/carve_booleans/source/blender/render/intern/source/render_texture.c
    branches/carve_booleans/source/blender/render/intern/source/rendercore.c
    branches/carve_booleans/source/blender/render/intern/source/renderdatabase.c
    branches/carve_booleans/source/blender/render/intern/source/shadbuf.c
    branches/carve_booleans/source/blender/render/intern/source/shadeoutput.c
    branches/carve_booleans/source/blender/render/intern/source/sss.c
    branches/carve_booleans/source/blender/render/intern/source/strand.c
    branches/carve_booleans/source/blender/render/intern/source/sunsky.c
    branches/carve_booleans/source/blender/render/intern/source/volume_precache.c
    branches/carve_booleans/source/blender/render/intern/source/volumetric.c
    branches/carve_booleans/source/blender/render/intern/source/voxeldata.c
    branches/carve_booleans/source/blender/render/intern/source/zbuf.c
    branches/carve_booleans/source/blender/windowmanager/CMakeLists.txt
    branches/carve_booleans/source/blender/windowmanager/SConscript
    branches/carve_booleans/source/blender/windowmanager/WM_api.h
    branches/carve_booleans/source/blender/windowmanager/WM_types.h
    branches/carve_booleans/source/blender/windowmanager/intern/wm.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_event_system.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_files.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_init_exit.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_jobs.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_keymap.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_operators.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_subwindow.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_window.c
    branches/carve_booleans/source/blender/windowmanager/wm_event_types.h
    branches/carve_booleans/source/blenderplayer/CMakeLists.txt
    branches/carve_booleans/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/carve_booleans/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/carve_booleans/source/creator/CMakeLists.txt
    branches/carve_booleans/source/creator/buildinfo.c
    branches/carve_booleans/source/creator/creator.c
    branches/carve_booleans/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/carve_booleans/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/carve_booleans/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/carve_booleans/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ActionActuator.h
    branches/carve_booleans/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ArmatureObject.h
    branches/carve_booleans/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/carve_booleans/source/gameengine/Converter/BL_MeshDeformer.h
    branches/carve_booleans/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/carve_booleans/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/carve_booleans/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_SkinDeformer.h
    branches/carve_booleans/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/carve_booleans/source/gameengine/Converter/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/carve_booleans/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/carve_booleans/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_IpoConvert.h
    branches/carve_booleans/source/gameengine/Converter/SConscript
    branches/carve_booleans/source/gameengine/Expressions/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Expressions/InputParser.cpp
    branches/carve_booleans/source/gameengine/Expressions/ListValue.cpp
    branches/carve_booleans/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/carve_booleans/source/gameengine/Expressions/PyObjectPlus.h
    branches/carve_booleans/source/gameengine/Expressions/Value.cpp
    branches/carve_booleans/source/gameengine/GameLogic/CMakeLists.txt
    branches/carve_booleans/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_ISensor.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_PythonController.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/carve_booleans/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/xembed/npunix.c
    branches/carve_booleans/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/carve_booleans/source/gameengine/Ketsji/BL_Material.h
    branches/carve_booleans/source/gameengine/Ketsji/BL_Shader.cpp
    branches/carve_booleans/source/gameengine/Ketsji/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_Camera.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_Dome.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_GameObject.h
    branches/carve_booleans/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/carve_booleans/source/gameengine/Ketsji/KX_Light.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_PyMath.h
    branches/carve_booleans/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_Scene.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_Scene.h
    branches/carve_booleans/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/carve_booleans/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/carve_booleans/source/gameengine/Ketsji/SConscript
    branches/carve_booleans/source/gameengine/Network/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/carve_booleans/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/carve_booleans/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/carve_booleans/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/carve_booleans/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/carve_booleans/source/gameengine/Rasterizer/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/carve_booleans/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/carve_booleans/source/gameengine/SceneGraph/SG_DList.h
    branches/carve_booleans/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/carve_booleans/source/gameengine/SceneGraph/SG_IObject.h
    branches/carve_booleans/source/gameengine/SceneGraph/SG_QList.h
    branches/carve_booleans/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/CMakeLists.txt
    branches/carve_booleans/source/gameengine/VideoTexture/Exception.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/Exception.h
    branches/carve_booleans/source/gameengine/VideoTexture/FilterColor.h
    branches/carve_booleans/source/gameengine/VideoTexture/ImageBase.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/ImageMix.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/ImageRender.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/carve_booleans/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/carve_booleans/source/tests/CMakeLists.txt
    branches/carve_booleans/source/tests/bl_run_operators.py
    branches/carve_booleans/source/tools/CTS/FBlender.py

Added Paths:
-----------
    branches/carve_booleans/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/carve_booleans/build_files/cmake/Modules/FindSpacenav.cmake
    branches/carve_booleans/build_files/cmake/config/
    branches/carve_booleans/build_files/cmake/config/blender_headless.cmake
    branches/carve_booleans/build_files/cmake/config/blender_lite.cmake
    branches/carve_booleans/build_files/cmake/config/bpy_module.cmake
    branches/carve_booleans/build_files/scons/config/linux-config.py
    branches/carve_booleans/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/carve_booleans/doc/python_api/rst/info_gotcha.rst
    branches/carve_booleans/doc/python_api/rst/info_overview.rst
    branches/carve_booleans/doc/python_api/rst/info_quickstart.rst
    branches/carve_booleans/doc/python_api/rst/info_tips_and_tricks.rst
    branches/carve_booleans/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/carve_booleans/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
    branches/carve_booleans/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
    branches/carve_booleans/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
    branches/carve_booleans/intern/audaspace/intern/AUD_AnimateableProperty.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_AnimateableProperty.h
    branches/carve_booleans/intern/audaspace/intern/AUD_FileWriter.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_FileWriter.h
    branches/carve_booleans/intern/audaspace/intern/AUD_I3DHandle.h
    branches/carve_booleans/intern/audaspace/intern/AUD_IHandle.h
    branches/carve_booleans/intern/audaspace/intern/AUD_IWriter.h
    branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleFactory.h
    branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ResampleReader.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_ResampleReader.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerEntry.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerEntry.h
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
    branches/carve_booleans/intern/audaspace/sndfile/AUD_SndFileWriter.h
    branches/carve_booleans/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerWin32.h
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_NDOFManagerX11.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemSDL.h
    branches/carve_booleans/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_WindowSDL.h
    branches/carve_booleans/intern/tools/credits_svn_gen.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/carve_booleans/release/scripts/templates/batch_export.py
    branches/carve_booleans/release/scripts/templates/ui_menu.py
    branches/carve_booleans/release/scripts/templates/ui_menu_simple.py
    branches/carve_booleans/release/scripts/templates/ui_panel_simple.py
    branches/carve_booleans/source/blender/blenkernel/BKE_speaker.h
    branches/carve_booleans/source/blender/blenkernel/intern/speaker.c
    branches/carve_booleans/source/blender/collada/AnimationExporter.cpp
    branches/carve_booleans/source/blender/collada/AnimationExporter.h
    branches/carve_booleans/source/blender/collada/ErrorHandler.cpp
    branches/carve_booleans/source/blender/collada/ErrorHandler.h
    branches/carve_booleans/source/blender/collada/SceneExporter.cpp
    branches/carve_booleans/source/blender/collada/SceneExporter.h
    branches/carve_booleans/source/blender/editors/gpencil/gpencil_undo.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_draw.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_edit.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_select.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_tools.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_tree.c
    branches/carve_booleans/source/blender/imbuf/intern/IMB_indexer.h
    branches/carve_booleans/source/blender/imbuf/intern/indexer.c
    branches/carve_booleans/source/blender/imbuf/intern/indexer_dv.c
    branches/carve_booleans/source/blender/makesdna/DNA_speaker_types.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_speaker.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_texture_api.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/carve_booleans/source/blender/nodes/NOD_composite.h
    branches/carve_booleans/source/blender/nodes/NOD_shader.h
    branches/carve_booleans/source/blender/nodes/NOD_socket.h
    branches/carve_booleans/source/blender/nodes/NOD_texture.h
    branches/carve_booleans/source/blender/nodes/composite/
    branches/carve_booleans/source/blender/nodes/composite/node_composite_tree.c
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.c
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.h
    branches/carve_booleans/source/blender/nodes/composite/nodes/
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/carve_booleans/source/blender/nodes/intern/node_common.c
    branches/carve_booleans/source/blender/nodes/intern/node_common.h
    branches/carve_booleans/source/blender/nodes/intern/node_exec.c
    branches/carve_booleans/source/blender/nodes/intern/node_exec.h
    branches/carve_booleans/source/blender/nodes/intern/node_socket.c
    branches/carve_booleans/source/blender/nodes/shader/
    branches/carve_booleans/source/blender/nodes/shader/node_shader_tree.c
    branches/carve_booleans/source/blender/nodes/shader/node_shader_util.c
    branches/carve_booleans/source/blender/nodes/shader/node_shader_util.h
    branches/carve_booleans/source/blender/nodes/shader/nodes/
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/carve_booleans/source/blender/nodes/texture/
    branches/carve_booleans/source/blender/nodes/texture/node_texture_tree.c
    branches/carve_booleans/source/blender/nodes/texture/node_texture_util.c
    branches/carve_booleans/source/blender/nodes/texture/node_texture_util.h
    branches/carve_booleans/source/blender/nodes/texture/nodes/
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/carve_booleans/source/blender/python/mathutils/
    branches/carve_booleans/source/blender/python/mathutils/CMakeLists.txt
    branches/carve_booleans/source/blender/python/mathutils/mathutils.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Color.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Color.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Euler.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Euler.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Matrix.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Matrix.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Vector.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Vector.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_geometry.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_geometry.h
    branches/carve_booleans/source/blender/windowmanager/WM_keymap.h
    branches/carve_booleans/source/gameengine/Ketsji/BL_Action.cpp
    branches/carve_booleans/source/gameengine/Ketsji/BL_Action.h
    branches/carve_booleans/source/gameengine/Ketsji/BL_ActionManager.cpp
    branches/carve_booleans/source/gameengine/Ketsji/BL_ActionManager.h
    branches/carve_booleans/source/tests/check_deprecated.py
    branches/carve_booleans/source/tools/MakeGLStipple.py

Removed Paths:
-------------
    branches/carve_booleans/build_files/cmake/config/blender_headless.cmake
    branches/carve_booleans/build_files/cmake/config/blender_lite.cmake
    branches/carve_booleans/build_files/cmake/config/bpy_module.cmake
    branches/carve_booleans/build_files/scons/config/linux2-config.py
    branches/carve_booleans/intern/audaspace/intern/AUD_DefaultMixer.cpp
    branches/carve_booleans/intern/audaspace/intern/AUD_DefaultMixer.h
    branches/carve_booleans/release/scripts/templates/panel_simple.py
    branches/carve_booleans/source/blender/editors/space_outliner/outliner.c
    branches/carve_booleans/source/blender/editors/transform/transform_ndofinput.c
    branches/carve_booleans/source/blender/nodes/CMP_node.h
    branches/carve_booleans/source/blender/nodes/SHD_node.h
    branches/carve_booleans/source/blender/nodes/TEX_node.h
    branches/carve_booleans/source/blender/nodes/composite/node_composite_tree.c
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.c
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.h
    branches/carve_booleans/source/blender/nodes/composite/nodes/
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/carve_booleans/source/blender/nodes/intern/CMP_nodes/
    branches/carve_booleans/source/blender/nodes/intern/CMP_util.c
    branches/carve_booleans/source/blender/nodes/intern/CMP_util.h
    branches/carve_booleans/source/blender/nodes/intern/SHD_nodes/
    branches/carve_booleans/source/blender/nodes/intern/SHD_util.c
    branches/carve_booleans/source/blender/nodes/intern/SHD_util.h
    branches/carve_booleans/source/blender/nodes/intern/TEX_nodes/
    branches/carve_booleans/source/blender/nodes/intern/TEX_util.c
    branches/carve_booleans/source/blender/nodes/intern/TEX_util.h
    branches/carve_booleans/source/blender/nodes/shader/node_shader_tree.c
    branches/carve_booleans/source/blender/nodes/shader/node_shader_util.c
    branches/carve_booleans/source/blender/nodes/shader/node_shader_util.h
    branches/carve_booleans/source/blender/nodes/shader/nodes/
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/carve_booleans/source/blender/nodes/texture/node_texture_tree.c
    branches/carve_booleans/source/blender/nodes/texture/node_texture_util.c
    branches/carve_booleans/source/blender/nodes/texture/node_texture_util.h
    branches/carve_booleans/source/blender/nodes/texture/nodes/
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/carve_booleans/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/carve_booleans/source/blender/python/generic/mathutils.c
    branches/carve_booleans/source/blender/python/generic/mathutils.h
    branches/carve_booleans/source/blender/python/generic/mathutils_Color.c
    branches/carve_booleans/source/blender/python/generic/mathutils_Color.h
    branches/carve_booleans/source/blender/python/generic/mathutils_Euler.c
    branches/carve_booleans/source/blender/python/generic/mathutils_Euler.h
    branches/carve_booleans/source/blender/python/generic/mathutils_Matrix.c
    branches/carve_booleans/source/blender/python/generic/mathutils_Matrix.h
    branches/carve_booleans/source/blender/python/generic/mathutils_Quaternion.c
    branches/carve_booleans/source/blender/python/generic/mathutils_Quaternion.h
    branches/carve_booleans/source/blender/python/generic/mathutils_Vector.c
    branches/carve_booleans/source/blender/python/generic/mathutils_Vector.h
    branches/carve_booleans/source/blender/python/generic/mathutils_geometry.c
    branches/carve_booleans/source/blender/python/generic/mathutils_geometry.h
    branches/carve_booleans/source/blender/python/mathutils/CMakeLists.txt
    branches/carve_booleans/source/blender/python/mathutils/mathutils.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Color.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Color.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Euler.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Euler.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Matrix.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Matrix.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Vector.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_Vector.h
    branches/carve_booleans/source/blender/python/mathutils/mathutils_geometry.c
    branches/carve_booleans/source/blender/python/mathutils/mathutils_geometry.h

Property Changed:
----------------
    branches/carve_booleans/
    branches/carve_booleans/doc/python_api/rst/bge.constraints.rst
    branches/carve_booleans/source/blender/editors/space_outliner/


Property changes on: branches/carve_booleans
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:37404-38278
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:37404-40000

Modified: branches/carve_booleans/CMakeLists.txt
===================================================================
--- branches/carve_booleans/CMakeLists.txt	2011-10-06 16:59:58 UTC (rev 40835)
+++ branches/carve_booleans/CMakeLists.txt	2011-10-06 17:16:00 UTC (rev 40836)
@@ -63,6 +63,22 @@
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 #-----------------------------------------------------------------------------
+# Set policy
+
+# see "cmake --help-policy CMP0003"
+# So library linking is more sane
+cmake_policy(SET CMP0003 NEW)
+
+# So BUILDINFO and BLENDERPATH strings are automatically quoted
+cmake_policy(SET CMP0005 NEW)
+
+# So syntax problems are errors
+cmake_policy(SET CMP0010 NEW)
+
+# Input directories must have CMakeLists.txt
+cmake_policy(SET CMP0014 NEW)
+
+#-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
 
@@ -90,6 +106,9 @@
 get_blender_version()
 
 # Blender internal features
+option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
+mark_as_advanced(WITH_BLENDER)
+
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
@@ -106,12 +125,21 @@
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 
-option(WITH_AUDASPACE    "Build with blenders audio library" ON)
-mark_as_advanced(WITH_AUDASPACE)
+# GHOST Windowing Library Options
+option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
+mark_as_advanced(WITH_GHOST_DEBUG)
 
+option(WITH_GHOST_SDL    "Enable building blender against SDL for windowing rather then the native APIs" OFF)
+mark_as_advanced(WITH_GHOST_SDL)
+
+# Misc...
 option(WITH_HEADLESS      "Build without graphical support (renderfarm, server mode only)" OFF)
 mark_as_advanced(WITH_HEADLESS)
 
+option(WITH_AUDASPACE    "Build with blenders audio library (only disable if you know what you're doing!)" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
+
 # (unix defaults to OpenMP On)
 if(UNIX AND NOT APPLE)
 	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -129,6 +157,7 @@
 
 # Modifiers
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
@@ -142,6 +171,7 @@
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
 option(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
 option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
@@ -168,6 +198,7 @@
 option(WITH_CARVE         "Enable Carve library to handle mesh boolean operations" ON)
 
 # Misc
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -204,6 +235,10 @@
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+	message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
+endif()
+
 if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
@@ -212,6 +247,10 @@
 	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
 endif()
 
+if(NOT WITH_SDL AND WITH_GHOST_SDL)
+	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+endif()
+
 if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
 	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
 endif()
@@ -238,6 +277,11 @@
 
 TEST_SSE_SUPPORT()
 
+# don't store paths to libs for portable distrobution
+if(WITH_INSTALL_PORTABLE)
+	set(CMAKE_SKIP_BUILD_RPATH TRUE)
+endif()
+
 #-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 
@@ -409,21 +453,20 @@
 	endif()
 
 	if(WITH_OPENCOLLADA)
-		set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
-		mark_as_advanced(OPENCOLLADA)
-		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-		set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
+		find_package(OpenCOLLADA)
+		if(OPENCOLLADA_FOUND)
+			set(PCRE /usr CACHE PATH "PCRE Directory")
+			mark_as_advanced(PCRE)
+			set(PCRE_LIBPATH ${PCRE}/lib)
+			set(PCRE_LIB pcre)
 
-		set(PCRE /usr CACHE PATH "PCRE Directory")
-		mark_as_advanced(PCRE)
-		set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
-
-		set(EXPAT /usr CACHE PATH "Expat Directory")
-		mark_as_advanced(EXPAT)
-		set(EXPAT_LIBPATH ${EXPAT}/lib)
-		set(EXPAT_LIB expat)
+			set(EXPAT /usr CACHE PATH "Expat Directory")
+			mark_as_advanced(EXPAT)
+			set(EXPAT_LIBPATH ${EXPAT}/lib)
+			set(EXPAT_LIB expat)
+		else()
+			set(WITH_OPENCOLLADA OFF)
+		endif()
 	endif()
 
 	if(WITH_MEM_JEMALLOC)
@@ -433,10 +476,23 @@
 		endif()
 	endif()
 
+	if (WITH_INPUT_NDOF)
+		find_package(Spacenav)
+		if(NOT SPACENAV_FOUND)
+			set(WITH_INPUT_NDOF OFF)
+		endif()
+
+		# use generic names within blenders buildsystem.
+		if(SPACENAV_FOUND)
+			set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
+			set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
+		endif()
+	endif()
+
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
 
-	if(NOT WITH_HEADLESS)
+	if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
 		find_package(X11 REQUIRED)
 		find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
 		mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@ -466,6 +522,9 @@
 	# GNU Compiler
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# CLang is the same as GCC for now.
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -632,9 +691,15 @@
 		endif()
 
 		if(WITH_OPENCOLLADA)
-			set(OPENCOLLADA_INCLUDE_DIR
-				${LIBDIR}/opencollada/include
+
+			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			
 			)
+
 			set(OPENCOLLADA_LIBRARIES
 				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
 				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
@@ -658,11 +723,11 @@
 				${LIBDIR}/ffmpeg/include/msvc
 			)
 			set(FFMPEG_LIBRARIES
-				${LIBDIR}/ffmpeg/lib/avcodec-52.lib
-				${LIBDIR}/ffmpeg/lib/avformat-52.lib
-				${LIBDIR}/ffmpeg/lib/avdevice-52.lib
-				${LIBDIR}/ffmpeg/lib/avutil-50.lib
-				${LIBDIR}/ffmpeg/lib/swscale-0.lib
+				${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+				${LIBDIR}/ffmpeg/lib/avformat-53.lib
+				${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+				${LIBDIR}/ffmpeg/lib/avutil-51.lib
+				${LIBDIR}/ffmpeg/lib/swscale-2.lib
 			)
 		endif()
 
@@ -711,10 +776,14 @@
 		endif()
 
 		if(WITH_PYTHON)
-			set(PYTHON_VERSION 3.2)
-			set(PYTHON_INCLUDE_DIRS "${LIBDIR}/python/include/python${PYTHON_VERSION}")
-			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
+			# normally cached but not since we include them with blender
+			set(PYTHON_VERSION 3.2) # CACHE STRING)
+			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+			set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
+
+			# uncached vars
+			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+			set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
 		endif()
 
 		set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
@@ -731,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)
@@ -776,7 +845,13 @@
 
 		if(WITH_OPENCOLLADA)
 			set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
-			set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+			set(OPENCOLLADA_INCLUDE_DIRS
+				${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)
 			set(PCRE_LIB pcre)
@@ -785,18 +860,15 @@
 		if(WITH_CODEC_FFMPEG)

@@ Diff output truncated at 10240 characters. @@