[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39508] branches/soc-2011-avocado/blender: svn merge rev.
Andrea Weikert
elubie at gmx.net
Wed Aug 17 22:17:44 CEST 2011
Revision: 39508
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39508
Author: elubie
Date: 2011-08-17 20:17:43 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
svn merge rev. 38068:39407, 39431-39505 from /branches/bmesh/blender
* these are the revisions missing from last merge.
Modified Paths:
--------------
branches/soc-2011-avocado/blender/CMakeLists.txt
branches/soc-2011-avocado/blender/GNUmakefile
branches/soc-2011-avocado/blender/SConstruct
branches/soc-2011-avocado/blender/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-avocado/blender/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-avocado/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-avocado/blender/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-avocado/blender/build_files/buildbot/master.cfg
branches/soc-2011-avocado/blender/build_files/buildbot/master_unpack.py
branches/soc-2011-avocado/blender/build_files/buildbot/slave_compile.py
branches/soc-2011-avocado/blender/build_files/buildbot/slave_pack.py
branches/soc-2011-avocado/blender/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-avocado/blender/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-avocado/blender/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-avocado/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2011-avocado/blender/build_files/cmake/macros.cmake
branches/soc-2011-avocado/blender/build_files/scons/config/aix4-config.py
branches/soc-2011-avocado/blender/build_files/scons/config/darwin-config.py
branches/soc-2011-avocado/blender/build_files/scons/config/linux2-config.py
branches/soc-2011-avocado/blender/build_files/scons/config/win32-vc-config.py
branches/soc-2011-avocado/blender/build_files/scons/config/win64-vc-config.py
branches/soc-2011-avocado/blender/build_files/scons/tools/Blender.py
branches/soc-2011-avocado/blender/build_files/scons/tools/btools.py
branches/soc-2011-avocado/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2011-avocado/blender/doc/blender_file_format/BlendFileReader.py
branches/soc-2011-avocado/blender/doc/doxygen/Doxyfile
branches/soc-2011-avocado/blender/doc/python_api/blender-org/layout.html
branches/soc-2011-avocado/blender/doc/python_api/blender-org/static/default.css_t
branches/soc-2011-avocado/blender/doc/python_api/examples/bpy.types.RenderEngine.py
branches/soc-2011-avocado/blender/doc/python_api/examples/mathutils.Vector.py
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.events.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.logic.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.render.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.types.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/change_log.rst
branches/soc-2011-avocado/blender/doc/python_api/sphinx_changelog_gen.py
branches/soc-2011-avocado/blender/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-avocado/blender/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-avocado/blender/extern/binreloc/CMakeLists.txt
branches/soc-2011-avocado/blender/extern/bullet2/CMakeLists.txt
branches/soc-2011-avocado/blender/extern/eltopo/CMakeLists.txt
branches/soc-2011-avocado/blender/extern/glew/CMakeLists.txt
branches/soc-2011-avocado/blender/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-avocado/blender/extern/lzo/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/audaspace/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-avocado/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-avocado/blender/intern/boolop/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/bsp/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/elbeem/extern/elbeem.h
branches/soc-2011-avocado/blender/intern/elbeem/intern/simulation_object.cpp
branches/soc-2011-avocado/blender/intern/elbeem/intern/solver_class.h
branches/soc-2011-avocado/blender/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-avocado/blender/intern/elbeem/intern/solver_interface.h
branches/soc-2011-avocado/blender/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-avocado/blender/intern/ghost/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/ghost/GHOST_C-api.h
branches/soc-2011-avocado/blender/intern/ghost/GHOST_ISystem.h
branches/soc-2011-avocado/blender/intern/ghost/GHOST_Types.h
branches/soc-2011-avocado/blender/intern/ghost/SConscript
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_Debug.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_EventManager.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_EventNDOF.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_EventPrinter.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManager.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_System.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_System.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowNULL.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-avocado/blender/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2011-avocado/blender/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2011-avocado/blender/intern/ghost/test/multitest/MultiTest.c
branches/soc-2011-avocado/blender/intern/iksolver/intern/IK_QJacobian.cpp
branches/soc-2011-avocado/blender/intern/iksolver/intern/IK_QJacobian.h
branches/soc-2011-avocado/blender/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-avocado/blender/intern/iksolver/intern/IK_QTask.cpp
branches/soc-2011-avocado/blender/intern/itasc/ConstraintSet.cpp
branches/soc-2011-avocado/blender/intern/mikktspace/mikktspace.c
branches/soc-2011-avocado/blender/intern/smoke/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2011-avocado/blender/release/datafiles/splash.png
branches/soc-2011-avocado/blender/release/scripts/modules/addon_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy/__init__.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy/ops.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy/path.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy/utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/__init__.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy_types.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpyml.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpyml_ui.py
branches/soc-2011-avocado/blender/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-avocado/blender/release/scripts/modules/console/intellisense.py
branches/soc-2011-avocado/blender/release/scripts/modules/console_python.py
branches/soc-2011-avocado/blender/release/scripts/modules/keyingsets_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/rna_info.py
branches/soc-2011-avocado/blender/release/scripts/modules/rna_prop_ui.py
branches/soc-2011-avocado/blender/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/image.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/object.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-avocado/blender/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-avocado/blender/release/scripts/templates/addon_add_object.py
branches/soc-2011-avocado/blender/release/scripts/templates/operator_modal.py
branches/soc-2011-avocado/blender/release/scripts/templates/operator_modal_draw.py
branches/soc-2011-avocado/blender/release/scripts/templates/operator_modal_timer.py
branches/soc-2011-avocado/blender/release/scripts/templates/operator_modal_view3d.py
branches/soc-2011-avocado/blender/release/text/GPL-license.txt
branches/soc-2011-avocado/blender/release/text/readme.html
branches/soc-2011-avocado/blender/source/blender/avi/AVI_avi.h
branches/soc-2011-avocado/blender/source/blender/avi/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/avi/SConscript
branches/soc-2011-avocado/blender/source/blender/avi/intern/avi.c
branches/soc-2011-avocado/blender/source/blender/avi/intern/options.c
branches/soc-2011-avocado/blender/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_action.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_global.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_material.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_node.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/blenkernel/SConscript
branches/soc-2011-avocado/blender/source/blender/blenkernel/depsgraph_private.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/action.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/anim.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/armature.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/blender.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/boids.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/brush.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/curve.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/displist.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/effect.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/image.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/key.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/material.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/multires.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/nla.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/node.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/object.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/paint.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/particle.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/sca.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/scene.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/sound.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/text.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/texture.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/unit.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_smallhash.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_winstuff.h
branches/soc-2011-avocado/blender/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_color.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/path_util.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/storage.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/uvproject.c
branches/soc-2011-avocado/blender/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-avocado/blender/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/blenloader/intern/readfile.c
branches/soc-2011-avocado/blender/source/blender/blenloader/intern/writefile.c
branches/soc-2011-avocado/blender/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/blenpluginapi/iff.h
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_eulers.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/connectops.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/extrudeops.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/mesh_conv.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/subdivideop.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/utils.c
branches/soc-2011-avocado/blender/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/ArmatureExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/collada/CameraExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/CameraExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/DocumentExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/DocumentImporter.h
branches/soc-2011-avocado/blender/source/blender/collada/EffectExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/EffectExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/GeometryExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/ImageExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/ImageExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/LightExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/LightExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/MaterialExporter.h
branches/soc-2011-avocado/blender/source/blender/collada/MeshImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/MeshImporter.h
branches/soc-2011-avocado/blender/source/blender/collada/SkinInfo.cpp
branches/soc-2011-avocado/blender/source/blender/collada/collada.cpp
branches/soc-2011-avocado/blender/source/blender/collada/collada.h
branches/soc-2011-avocado/blender/source/blender/collada/collada_internal.cpp
branches/soc-2011-avocado/blender/source/blender/editors/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/animation/anim_markers.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/armature/armature_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/armature/armature_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/editarmature.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/poseSlide.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/poseUtils.c
branches/soc-2011-avocado/blender/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/curve/editcurve.c
branches/soc-2011-avocado/blender/source/blender/editors/curve/editfont.c
branches/soc-2011-avocado/blender/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/datafiles/preview.blend.c
branches/soc-2011-avocado/blender/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-avocado/blender/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-avocado/blender/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-avocado/blender/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-avocado/blender/source/blender/editors/include/ED_curve.h
branches/soc-2011-avocado/blender/source/blender/editors/include/ED_mesh.h
branches/soc-2011-avocado/blender/source/blender/editors/include/ED_node.h
branches/soc-2011-avocado/blender/source/blender/editors/include/ED_object.h
branches/soc-2011-avocado/blender/source/blender/editors/include/ED_transform.h
branches/soc-2011-avocado/blender/source/blender/editors/include/UI_interface.h
branches/soc-2011-avocado/blender/source/blender/editors/include/UI_resources.h
branches/soc-2011-avocado/blender/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_anim.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_icons.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_layout.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_panel.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_regions.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_style.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_templates.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_utils.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/resources.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/view2d.c
branches/soc-2011-avocado/blender/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/mesh/bmesh_select.c
branches/soc-2011-avocado/blender/source/blender/editors/mesh/bmesh_tools.c
branches/soc-2011-avocado/blender/source/blender/editors/mesh/editface.c
branches/soc-2011-avocado/blender/source/blender/editors/mesh/knifetool.c
branches/soc-2011-avocado/blender/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-avocado/blender/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/object/object_add.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_bake.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_hook.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_modifier.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_relations.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_transform.c
branches/soc-2011-avocado/blender/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/physics/particle_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-avocado/blender/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/render/render_internal.c
branches/soc-2011-avocado/blender/source/blender/editors/render/render_opengl.c
branches/soc-2011-avocado/blender/source/blender/editors/render/render_preview.c
branches/soc-2011-avocado/blender/source/blender/editors/render/render_shading.c
branches/soc-2011-avocado/blender/source/blender/editors/render/render_update.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/screen/area.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/glutil.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/screen_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/screen_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-avocado/blender/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/sound/sound_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-avocado/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-avocado/blender/source/blender/editors/space_console/console_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_console/console_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_file/file_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_file/file_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_file/filelist.c
branches/soc-2011-avocado/blender/source/blender/editors/space_file/filesel.c
branches/soc-2011-avocado/blender/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-avocado/blender/source/blender/editors/space_image/image_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_image/image_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_image/space_image.c
branches/soc-2011-avocado/blender/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_info/info_stats.c
branches/soc-2011-avocado/blender/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-avocado/blender/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_node/drawnode.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_header.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/space_node.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-avocado/blender/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_python.c
branches/soc-2011-avocado/blender/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform.h
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_generics.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_snap.c
branches/soc-2011-avocado/blender/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/util/ed_util.c
branches/soc-2011-avocado/blender/source/blender/editors/util/undo.c
branches/soc-2011-avocado/blender/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-avocado/blender/source/blender/gpu/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/gpu/GPU_buffers.h
branches/soc-2011-avocado/blender/source/blender/gpu/GPU_draw.h
branches/soc-2011-avocado/blender/source/blender/gpu/GPU_extensions.h
branches/soc-2011-avocado/blender/source/blender/gpu/SConscript
branches/soc-2011-avocado/blender/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-avocado/blender/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-avocado/blender/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-avocado/blender/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/divers.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/filter.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/rectop.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/util.c
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-avocado/blender/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-avocado/blender/source/blender/makesrna/RNA_access.h
branches/soc-2011-avocado/blender/source/blender/makesrna/RNA_types.h
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/SConscript
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-avocado/blender/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_util.h
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-avocado/blender/source/blender/nodes/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/CMP_util.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/SHD_util.c
branches/soc-2011-avocado/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/soc-2011-avocado/blender/source/blender/python/BPY_extern.h
branches/soc-2011-avocado/blender/source/blender/python/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/python/SConscript
branches/soc-2011-avocado/blender/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/python/generic/IDProp.c
branches/soc-2011-avocado/blender/source/blender/python/generic/IDProp.h
branches/soc-2011-avocado/blender/source/blender/python/generic/bgl.c
branches/soc-2011-avocado/blender/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-avocado/blender/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-avocado/blender/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_app.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_driver.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_interface.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_library.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_operator.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_props.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna.h
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_util.c
branches/soc-2011-avocado/blender/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-avocado/blender/source/blender/render/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/render/SConscript
branches/soc-2011-avocado/blender/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-avocado/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2011-avocado/blender/source/blender/render/intern/include/rayobject.h
branches/soc-2011-avocado/blender/source/blender/render/intern/include/render_types.h
branches/soc-2011-avocado/blender/source/blender/render/intern/source/convertblender.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/envmap.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/pipeline.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/rayshade.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/render_texture.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/rendercore.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/renderdatabase.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/strand.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/sunsky.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/volumetric.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/zbuf.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blender/windowmanager/WM_api.h
branches/soc-2011-avocado/blender/source/blender/windowmanager/WM_types.h
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/wm_event_types.h
branches/soc-2011-avocado/blender/source/blenderplayer/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-avocado/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-avocado/blender/source/creator/CMakeLists.txt
branches/soc-2011-avocado/blender/source/creator/creator.c
branches/soc-2011-avocado/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-avocado/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-avocado/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-avocado/blender/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-avocado/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-avocado/blender/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-avocado/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-avocado/blender/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-avocado/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-avocado/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/SConscript
branches/soc-2011-avocado/blender/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-avocado/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-avocado/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2011-avocado/blender/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-avocado/blender/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-avocado/blender/source/tests/CMakeLists.txt
branches/soc-2011-avocado/blender/source/tests/bl_load_py_modules.py
branches/soc-2011-avocado/blender/source/tests/bl_run_operators.py
branches/soc-2011-avocado/blender/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-avocado/blender/source/blender/python/mathutils/
Removed Paths:
-------------
branches/soc-2011-avocado/blender/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-avocado/blender/doc/python_api/epy/BGL.py
branches/soc-2011-avocado/blender/release/scripts/templates/panel_simple.py
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/BLI_callbacks.h
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-avocado/blender/source/blender/editors/transform/transform_ndofinput.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Color.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Euler.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Matrix.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Quaternion.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_Vector.h
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-avocado/blender/source/blender/python/generic/mathutils_geometry.h
Property Changed:
----------------
branches/soc-2011-avocado/blender/
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-avocado/blender/source/blender/editors/render/render_update.c
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/
branches/soc-2011-avocado/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2011-avocado/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bmesh/blender:36841-38067,39408-39430
/trunk/blender:31524-37335
+ /branches/bmesh/blender:36841-39505
/trunk/blender:31524-39433
Modified: branches/soc-2011-avocado/blender/CMakeLists.txt
===================================================================
--- branches/soc-2011-avocado/blender/CMakeLists.txt 2011-08-17 20:17:27 UTC (rev 39507)
+++ branches/soc-2011-avocado/blender/CMakeLists.txt 2011-08-17 20:17:43 UTC (rev 39508)
@@ -49,9 +49,16 @@
cmake_minimum_required(VERSION 2.8)
+if(NOT EXECUTABLE_OUTPUT_PATH)
+ set(FIRST_RUN "TRUE")
+endif()
+
# this starts out unset
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
+# avoid having empty buildtype
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -83,6 +90,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)
@@ -100,9 +110,21 @@
option(WITH_PLAYER "Build Player" OFF)
option(WITH_ARPACK "Build ARPACK" OFF)
option(ARPACK_DOUBLE_PRECISION "Build ARPACK with double precision" ON)
+# 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)
@@ -120,6 +142,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)
@@ -133,9 +156,10 @@
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.mplayerhq.hu)" OFF)
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
if(APPLE OR (WIN32 AND NOT UNIX))
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
@@ -156,6 +180,7 @@
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" 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)
@@ -192,14 +217,22 @@
#-----------------------------------------------------------------------------
# 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()
-if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+ 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()
@@ -224,9 +257,6 @@
set(WITH_HEADLESS ON)
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -235,11 +265,27 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE)
+
+# C/C++ flags
+set(PLATFORM_CFLAGS)
+
# these are added to later on.
-set(C_WARNINGS "")
-set(CXX_WARNINGS "")
+set(C_WARNINGS)
+set(CXX_WARNINGS)
+# libraries to link the binary with passed to target_link_libraries()
+# known as LLIBS to scons
+set(PLATFORM_LINKLIBS)
+# Added to linker flags in setup_liblinks
+# - CMAKE_EXE_LINKER_FLAGS
+# - CMAKE_EXE_LINKER_FLAGS_DEBUG
+set(PLATFORM_LINKFLAGS)
+set(PLATFORM_LINKFLAGS_DEBUG)
+
+
# disabled for now, not supported
# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
@@ -247,13 +293,12 @@
# On Unix:
# cmake ../blender \
# -D PYTHON_VERSION=3.2 \
-# -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \
-# -D PYTHON_LIBPATH=/opt/py32/lib \
-# -D PYTHON_LIBRARY=python3.2d
+# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
+# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
#
# On Macs:
# cmake ../blender \
-# -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
+# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
# -G Xcode
#
@@ -269,65 +314,48 @@
set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
endif()
- if(WITH_OPENAL)
- find_package(OpenAL)
- if(NOT OPENAL_FOUND)
- set(WITH_OPENAL OFF)
- endif()
- endif()
+ find_package(JPEG REQUIRED)
+ find_package(PNG REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(Freetype REQUIRED)
- if(WITH_JACK)
- set(JACK /usr)
- set(JACK_INC ${JACK}/include/jack)
- set(JACK_LIB jack)
- set(JACK_LIBPATH ${JACK}/lib)
- endif()
+ if(WITH_PYTHON)
+ # No way to set py32. remove for now.
+ # find_package(PythonLibs)
- if(WITH_CODEC_SNDFILE)
- set(SNDFILE /usr)
- set(SNDFILE_INC ${SNDFILE}/include)
- set(SNDFILE_LIB sndfile)
- set(SNDFILE_LIBPATH ${SNDFILE}/lib)
+ # Use our own instead, since wothout py is such a rare case,
+ # require this package
+ find_package(PythonLibsUnix REQUIRED)
endif()
- if(WITH_INTERNATIONAL)
- find_library(INTL_LIBRARY
- NAMES intl
- PATHS
- /sw/lib
- )
- find_library(ICONV_LIBRARY
- NAMES iconv
- PATHS
- /sw/lib
- )
- mark_as_advanced(ICONV_LIBRARY)
- mark_as_advanced(INTL_LIBRARY)
+ if(WITH_IMAGE_OPENEXR)
+ find_package(OpenEXR) # our own module
+ if(NOT OPENEXR_FOUND)
+ set(WITH_IMAGE_OPENEXR OFF)
+ endif()
+ endif()
- if(INTL_LIBRARY AND ICONV_LIBRARY)
- set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ if(WITH_IMAGE_OPENJPEG)
+ find_package(OpenJPEG)
+ if(NOT OPENJPEG_FOUND)
+ set(WITH_IMAGE_OPENJPEG OFF)
endif()
endif()
- find_package(Freetype)
- # unset(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+ if(WITH_IMAGE_TIFF)
+ find_package(TIFF)
+ if(NOT TIFF_FOUND)
+ set(WITH_IMAGE_TIFF OFF)
+ endif()
+ endif()
-
- if(WITH_PYTHON)
- # No way to set py32. remove for now.
- # find_package(PythonLibs)
-
- # defines...
-
- # PYTHON_VERSION
- # PYTHON_INCLUDE_DIRS
- # PYTHON_LIBRARY
- # PYTHON_LIBPATH
- # PYTHON_LINKFLAGS
-
- include(build_files/cmake/FindPythonLibsUnix.cmake)
-
+ # Audio IO
+ if(WITH_OPENAL)
+ find_package(OpenAL)
+ if(NOT OPENAL_FOUND)
+ set(WITH_OPENAL OFF)
+ endif()
endif()
if(WITH_SDL)
@@ -342,115 +370,124 @@
endif()
endif()
- if(WITH_IMAGE_OPENEXR)
- set(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
- mark_as_advanced(OPENEXR)
- find_path(OPENEXR_INC
- ImfXdr.h
- PATHS
- ${OPENEXR}/include/OpenEXR
- /usr/local/include/OpenEXR
- /sw/include/OpenEXR
- /opt/local/include/OpenEXR
- /opt/csw/include/OpenEXR
- /opt/include/OpenEXR
- )
- mark_as_advanced(OPENEXR_INC)
-
- set(OPENEXR_LIB Half IlmImf Iex Imath)
-
- if(NOT OPENEXR_INC)
- set(WITH_IMAGE_OPENEXR OFF)
+ if(WITH_JACK)
+ find_package(Jack)
+ if(NOT JACK_FOUND)
+ set(WITH_JACK OFF)
endif()
endif()
- if(WITH_IMAGE_TIFF)
- find_package(TIFF)
- if(NOT TIFF_FOUND)
- set(WITH_IMAGE_TIFF OFF)
+ # Codecs
+ if(WITH_CODEC_SNDFILE)
+ find_package(SndFile)
+ if(NOT SNDFILE_FOUND)
+ set(WITH_CODEC_SNDFILE OFF)
endif()
endif()
- find_package(JPEG REQUIRED)
-
- find_package(PNG REQUIRED)
-
- find_package(ZLIB REQUIRED)
-
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
- set(FFMPEG_INC ${FFMPEG}/include)
- set(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
- mark_as_advanced(FFMPEG_LIB)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+ mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
+ if(WITH_INTERNATIONAL)
+ find_library(INTL_LIBRARY
+ NAMES intl
+ PATHS
+ /sw/lib
+ )
+
+ find_library(ICONV_LIBRARY
+ NAMES iconv
+ PATHS
+ /sw/lib
+ )
+ mark_as_advanced(ICONV_LIBRARY)
+ mark_as_advanced(INTL_LIBRARY)
+
+ if(INTL_LIBRARY AND ICONV_LIBRARY)
+ set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ endif()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list