[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39707] branches/particles-2010: svn merge -r36657:39477 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Fri Aug 26 10:13:11 CEST 2011
Revision: 39707
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39707
Author: lukastoenne
Date: 2011-08-26 08:13:08 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
svn merge -r36657:39477 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36657
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/GNUmakefile
branches/particles-2010/SConstruct
branches/particles-2010/build_files/buildbot/config/user-config-i686.py
branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py
branches/particles-2010/build_files/buildbot/config/user-config-player-x86_64.py
branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py
branches/particles-2010/build_files/buildbot/master.cfg
branches/particles-2010/build_files/buildbot/master_unpack.py
branches/particles-2010/build_files/buildbot/slave_compile.py
branches/particles-2010/build_files/buildbot/slave_pack.py
branches/particles-2010/build_files/cmake/cmake_consistency_check.py
branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
branches/particles-2010/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/build_files/scons/config/aix4-config.py
branches/particles-2010/build_files/scons/config/darwin-config.py
branches/particles-2010/build_files/scons/config/linux2-config.py
branches/particles-2010/build_files/scons/config/win32-vc-config.py
branches/particles-2010/build_files/scons/config/win64-vc-config.py
branches/particles-2010/build_files/scons/tools/Blender.py
branches/particles-2010/build_files/scons/tools/btools.py
branches/particles-2010/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/particles-2010/doc/blender_file_format/BlendFileReader.py
branches/particles-2010/doc/doxygen/Doxyfile
branches/particles-2010/doc/manpage/blender.1
branches/particles-2010/doc/python_api/blender-org/layout.html
branches/particles-2010/doc/python_api/blender-org/static/default.css_t
branches/particles-2010/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/particles-2010/doc/python_api/examples/bpy.types.RenderEngine.py
branches/particles-2010/doc/python_api/examples/mathutils.Vector.py
branches/particles-2010/doc/python_api/rst/bge.events.rst
branches/particles-2010/doc/python_api/rst/bge.logic.rst
branches/particles-2010/doc/python_api/rst/bge.render.rst
branches/particles-2010/doc/python_api/rst/bge.types.rst
branches/particles-2010/doc/python_api/rst/change_log.rst
branches/particles-2010/doc/python_api/sphinx_changelog_gen.py
branches/particles-2010/doc/python_api/sphinx_doc_gen.py
branches/particles-2010/doc/python_api/sphinx_doc_gen.sh
branches/particles-2010/extern/binreloc/CMakeLists.txt
branches/particles-2010/extern/bullet2/CMakeLists.txt
branches/particles-2010/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/particles-2010/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/particles-2010/extern/eltopo/CMakeLists.txt
branches/particles-2010/extern/glew/CMakeLists.txt
branches/particles-2010/extern/glew/include/GL/glew.h
branches/particles-2010/extern/glew/include/GL/glxew.h
branches/particles-2010/extern/glew/include/GL/wglew.h
branches/particles-2010/extern/glew/src/glew.c
branches/particles-2010/extern/libopenjpeg/CMakeLists.txt
branches/particles-2010/extern/libredcode/CMakeLists.txt
branches/particles-2010/extern/lzma/CMakeLists.txt
branches/particles-2010/extern/lzo/CMakeLists.txt
branches/particles-2010/intern/CMakeLists.txt
branches/particles-2010/intern/audaspace/CMakeLists.txt
branches/particles-2010/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/particles-2010/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/particles-2010/intern/audaspace/SConscript
branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/particles-2010/intern/boolop/CMakeLists.txt
branches/particles-2010/intern/bsp/CMakeLists.txt
branches/particles-2010/intern/bsp/SConscript
branches/particles-2010/intern/container/CMakeLists.txt
branches/particles-2010/intern/container/CTR_TaggedIndex.h
branches/particles-2010/intern/decimation/CMakeLists.txt
branches/particles-2010/intern/decimation/SConscript
branches/particles-2010/intern/elbeem/CMakeLists.txt
branches/particles-2010/intern/elbeem/extern/elbeem.h
branches/particles-2010/intern/elbeem/intern/simulation_object.cpp
branches/particles-2010/intern/elbeem/intern/solver_class.h
branches/particles-2010/intern/elbeem/intern/solver_init.cpp
branches/particles-2010/intern/elbeem/intern/solver_interface.h
branches/particles-2010/intern/ghost/CMakeLists.txt
branches/particles-2010/intern/ghost/GHOST_C-api.h
branches/particles-2010/intern/ghost/GHOST_ISystem.h
branches/particles-2010/intern/ghost/GHOST_Types.h
branches/particles-2010/intern/ghost/SConscript
branches/particles-2010/intern/ghost/intern/GHOST_C-api.cpp
branches/particles-2010/intern/ghost/intern/GHOST_Debug.h
branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_EventManager.cpp
branches/particles-2010/intern/ghost/intern/GHOST_EventNDOF.h
branches/particles-2010/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/particles-2010/intern/ghost/intern/GHOST_EventPrinter.h
branches/particles-2010/intern/ghost/intern/GHOST_ISystem.cpp
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManager.h
branches/particles-2010/intern/ghost/intern/GHOST_System.cpp
branches/particles-2010/intern/ghost/intern/GHOST_System.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/particles-2010/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.h
branches/particles-2010/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_Window.cpp
branches/particles-2010/intern/ghost/intern/GHOST_Window.h
branches/particles-2010/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowCocoa.h
branches/particles-2010/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_WindowX11.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowX11.h
branches/particles-2010/intern/ghost/test/gears/GHOST_C-Test.c
branches/particles-2010/intern/ghost/test/gears/GHOST_Test.cpp
branches/particles-2010/intern/ghost/test/multitest/MultiTest.c
branches/particles-2010/intern/guardedalloc/CMakeLists.txt
branches/particles-2010/intern/iksolver/CMakeLists.txt
branches/particles-2010/intern/iksolver/intern/IK_QJacobian.cpp
branches/particles-2010/intern/iksolver/intern/IK_QJacobian.h
branches/particles-2010/intern/iksolver/intern/IK_QSegment.cpp
branches/particles-2010/intern/iksolver/intern/IK_QTask.cpp
branches/particles-2010/intern/itasc/CMakeLists.txt
branches/particles-2010/intern/itasc/ConstraintSet.cpp
branches/particles-2010/intern/memutil/CMakeLists.txt
branches/particles-2010/intern/mikktspace/CMakeLists.txt
branches/particles-2010/intern/mikktspace/mikktspace.c
branches/particles-2010/intern/moto/CMakeLists.txt
branches/particles-2010/intern/opennl/CMakeLists.txt
branches/particles-2010/intern/smoke/CMakeLists.txt
branches/particles-2010/intern/smoke/intern/WAVELET_NOISE.h
branches/particles-2010/intern/string/CMakeLists.txt
branches/particles-2010/release/datafiles/splash.png
branches/particles-2010/release/text/GPL-license.txt
branches/particles-2010/release/text/readme.html
branches/particles-2010/release/windows/installer/00.sconsblender.nsi
branches/particles-2010/source/blender/avi/AVI_avi.h
branches/particles-2010/source/blender/avi/CMakeLists.txt
branches/particles-2010/source/blender/avi/SConscript
branches/particles-2010/source/blender/avi/intern/avi.c
branches/particles-2010/source/blender/avi/intern/options.c
branches/particles-2010/source/blender/blenfont/CMakeLists.txt
branches/particles-2010/source/blender/blenkernel/BKE_DerivedMesh.h
branches/particles-2010/source/blender/blenkernel/BKE_action.h
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_brush.h
branches/particles-2010/source/blender/blenkernel/BKE_colortools.h
branches/particles-2010/source/blender/blenkernel/BKE_curve.h
branches/particles-2010/source/blender/blenkernel/BKE_deform.h
branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h
branches/particles-2010/source/blender/blenkernel/BKE_displist.h
branches/particles-2010/source/blender/blenkernel/BKE_effect.h
branches/particles-2010/source/blender/blenkernel/BKE_global.h
branches/particles-2010/source/blender/blenkernel/BKE_icons.h
branches/particles-2010/source/blender/blenkernel/BKE_material.h
branches/particles-2010/source/blender/blenkernel/BKE_modifier.h
branches/particles-2010/source/blender/blenkernel/BKE_multires.h
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/BKE_object.h
branches/particles-2010/source/blender/blenkernel/BKE_particle.h
branches/particles-2010/source/blender/blenkernel/BKE_screen.h
branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
branches/particles-2010/source/blender/blenkernel/BKE_subsurf.h
branches/particles-2010/source/blender/blenkernel/BKE_text.h
branches/particles-2010/source/blender/blenkernel/BKE_texture.h
branches/particles-2010/source/blender/blenkernel/BKE_world.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenkernel/SConscript
branches/particles-2010/source/blender/blenkernel/depsgraph_private.h
branches/particles-2010/source/blender/blenkernel/intern/BME_tools.c
branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
branches/particles-2010/source/blender/blenkernel/intern/action.c
branches/particles-2010/source/blender/blenkernel/intern/anim.c
branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c
branches/particles-2010/source/blender/blenkernel/intern/armature.c
branches/particles-2010/source/blender/blenkernel/intern/blender.c
branches/particles-2010/source/blender/blenkernel/intern/boids.c
branches/particles-2010/source/blender/blenkernel/intern/brush.c
branches/particles-2010/source/blender/blenkernel/intern/bvhutils.c
branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
branches/particles-2010/source/blender/blenkernel/intern/colortools.c
branches/particles-2010/source/blender/blenkernel/intern/constraint.c
branches/particles-2010/source/blender/blenkernel/intern/curve.c
branches/particles-2010/source/blender/blenkernel/intern/customdata.c
branches/particles-2010/source/blender/blenkernel/intern/deform.c
branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
branches/particles-2010/source/blender/blenkernel/intern/displist.c
branches/particles-2010/source/blender/blenkernel/intern/effect.c
branches/particles-2010/source/blender/blenkernel/intern/fcurve.c
branches/particles-2010/source/blender/blenkernel/intern/icons.c
branches/particles-2010/source/blender/blenkernel/intern/image.c
branches/particles-2010/source/blender/blenkernel/intern/ipo.c
branches/particles-2010/source/blender/blenkernel/intern/key.c
branches/particles-2010/source/blender/blenkernel/intern/lattice.c
branches/particles-2010/source/blender/blenkernel/intern/material.c
branches/particles-2010/source/blender/blenkernel/intern/mesh.c
branches/particles-2010/source/blender/blenkernel/intern/modifier.c
branches/particles-2010/source/blender/blenkernel/intern/multires.c
branches/particles-2010/source/blender/blenkernel/intern/nla.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/object.c
branches/particles-2010/source/blender/blenkernel/intern/paint.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
branches/particles-2010/source/blender/blenkernel/intern/sca.c
branches/particles-2010/source/blender/blenkernel/intern/scene.c
branches/particles-2010/source/blender/blenkernel/intern/screen.c
branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
branches/particles-2010/source/blender/blenkernel/intern/shrinkwrap.c
branches/particles-2010/source/blender/blenkernel/intern/smoke.c
branches/particles-2010/source/blender/blenkernel/intern/softbody.c
branches/particles-2010/source/blender/blenkernel/intern/sound.c
branches/particles-2010/source/blender/blenkernel/intern/subsurf_ccg.c
branches/particles-2010/source/blender/blenkernel/intern/text.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenkernel/intern/unit.c
branches/particles-2010/source/blender/blenkernel/intern/world.c
branches/particles-2010/source/blender/blenkernel/intern/writeavi.c
branches/particles-2010/source/blender/blenkernel/intern/writeffmpeg.c
branches/particles-2010/source/blender/blenkernel/intern/writeframeserver.c
branches/particles-2010/source/blender/blenlib/BLI_ghash.h
branches/particles-2010/source/blender/blenlib/BLI_math_base.h
branches/particles-2010/source/blender/blenlib/BLI_math_color.h
branches/particles-2010/source/blender/blenlib/BLI_math_geom.h
branches/particles-2010/source/blender/blenlib/BLI_math_matrix.h
branches/particles-2010/source/blender/blenlib/BLI_math_vector.h
branches/particles-2010/source/blender/blenlib/BLI_path_util.h
branches/particles-2010/source/blender/blenlib/BLI_scanfill.h
branches/particles-2010/source/blender/blenlib/BLI_string.h
branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
branches/particles-2010/source/blender/blenlib/CMakeLists.txt
branches/particles-2010/source/blender/blenlib/intern/BLI_args.c
branches/particles-2010/source/blender/blenlib/intern/BLI_ghash.c
branches/particles-2010/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/particles-2010/source/blender/blenlib/intern/bpath.c
branches/particles-2010/source/blender/blenlib/intern/edgehash.c
branches/particles-2010/source/blender/blenlib/intern/math_base.c
branches/particles-2010/source/blender/blenlib/intern/math_base_inline.c
branches/particles-2010/source/blender/blenlib/intern/math_color.c
branches/particles-2010/source/blender/blenlib/intern/math_geom.c
branches/particles-2010/source/blender/blenlib/intern/math_matrix.c
branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
branches/particles-2010/source/blender/blenlib/intern/path_util.c
branches/particles-2010/source/blender/blenlib/intern/pbvh.c
branches/particles-2010/source/blender/blenlib/intern/rct.c
branches/particles-2010/source/blender/blenlib/intern/scanfill.c
branches/particles-2010/source/blender/blenlib/intern/storage.c
branches/particles-2010/source/blender/blenlib/intern/string.c
branches/particles-2010/source/blender/blenlib/intern/uvproject.c
branches/particles-2010/source/blender/blenloader/BLO_readfile.h
branches/particles-2010/source/blender/blenloader/BLO_writefile.h
branches/particles-2010/source/blender/blenloader/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenloader/intern/readfile.h
branches/particles-2010/source/blender/blenloader/intern/writefile.c
branches/particles-2010/source/blender/blenpluginapi/CMakeLists.txt
branches/particles-2010/source/blender/blenpluginapi/iff.h
branches/particles-2010/source/blender/collada/AnimationImporter.cpp
branches/particles-2010/source/blender/collada/ArmatureExporter.cpp
branches/particles-2010/source/blender/collada/ArmatureExporter.h
branches/particles-2010/source/blender/collada/ArmatureImporter.cpp
branches/particles-2010/source/blender/collada/CMakeLists.txt
branches/particles-2010/source/blender/collada/CameraExporter.cpp
branches/particles-2010/source/blender/collada/CameraExporter.h
branches/particles-2010/source/blender/collada/DocumentExporter.cpp
branches/particles-2010/source/blender/collada/DocumentExporter.h
branches/particles-2010/source/blender/collada/DocumentImporter.cpp
branches/particles-2010/source/blender/collada/DocumentImporter.h
branches/particles-2010/source/blender/collada/EffectExporter.cpp
branches/particles-2010/source/blender/collada/EffectExporter.h
branches/particles-2010/source/blender/collada/GeometryExporter.cpp
branches/particles-2010/source/blender/collada/GeometryExporter.h
branches/particles-2010/source/blender/collada/ImageExporter.cpp
branches/particles-2010/source/blender/collada/ImageExporter.h
branches/particles-2010/source/blender/collada/LightExporter.cpp
branches/particles-2010/source/blender/collada/LightExporter.h
branches/particles-2010/source/blender/collada/MaterialExporter.cpp
branches/particles-2010/source/blender/collada/MaterialExporter.h
branches/particles-2010/source/blender/collada/MeshImporter.cpp
branches/particles-2010/source/blender/collada/MeshImporter.h
branches/particles-2010/source/blender/collada/SkinInfo.cpp
branches/particles-2010/source/blender/collada/collada.cpp
branches/particles-2010/source/blender/collada/collada.h
branches/particles-2010/source/blender/collada/collada_internal.cpp
branches/particles-2010/source/blender/editors/CMakeLists.txt
branches/particles-2010/source/blender/editors/animation/CMakeLists.txt
branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
branches/particles-2010/source/blender/editors/animation/anim_markers.c
branches/particles-2010/source/blender/editors/animation/anim_ops.c
branches/particles-2010/source/blender/editors/animation/keyframes_draw.c
branches/particles-2010/source/blender/editors/animation/keyframing.c
branches/particles-2010/source/blender/editors/animation/keyingsets.c
branches/particles-2010/source/blender/editors/armature/CMakeLists.txt
branches/particles-2010/source/blender/editors/armature/armature_intern.h
branches/particles-2010/source/blender/editors/armature/armature_ops.c
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/armature/editarmature_sketch.c
branches/particles-2010/source/blender/editors/armature/poseSlide.c
branches/particles-2010/source/blender/editors/armature/poseUtils.c
branches/particles-2010/source/blender/editors/armature/poselib.c
branches/particles-2010/source/blender/editors/armature/poseobject.c
branches/particles-2010/source/blender/editors/curve/CMakeLists.txt
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/curve/editfont.c
branches/particles-2010/source/blender/editors/datafiles/CMakeLists.txt
branches/particles-2010/source/blender/editors/datafiles/preview.blend.c
branches/particles-2010/source/blender/editors/datafiles/splash.png.c
branches/particles-2010/source/blender/editors/datafiles/startup.blend.c
branches/particles-2010/source/blender/editors/gpencil/CMakeLists.txt
branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
branches/particles-2010/source/blender/editors/include/BIF_glutil.h
branches/particles-2010/source/blender/editors/include/ED_curve.h
branches/particles-2010/source/blender/editors/include/ED_keyframing.h
branches/particles-2010/source/blender/editors/include/ED_mesh.h
branches/particles-2010/source/blender/editors/include/ED_node.h
branches/particles-2010/source/blender/editors/include/ED_object.h
branches/particles-2010/source/blender/editors/include/ED_particle.h
branches/particles-2010/source/blender/editors/include/ED_screen.h
branches/particles-2010/source/blender/editors/include/ED_transform.h
branches/particles-2010/source/blender/editors/include/ED_types.h
branches/particles-2010/source/blender/editors/include/ED_util.h
branches/particles-2010/source/blender/editors/include/ED_view3d.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/include/UI_interface_icons.h
branches/particles-2010/source/blender/editors/include/UI_resources.h
branches/particles-2010/source/blender/editors/interface/CMakeLists.txt
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_anim.c
branches/particles-2010/source/blender/editors/interface/interface_draw.c
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_icons.c
branches/particles-2010/source/blender/editors/interface/interface_intern.h
branches/particles-2010/source/blender/editors/interface/interface_layout.c
branches/particles-2010/source/blender/editors/interface/interface_panel.c
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_style.c
branches/particles-2010/source/blender/editors/interface/interface_templates.c
branches/particles-2010/source/blender/editors/interface/interface_utils.c
branches/particles-2010/source/blender/editors/interface/interface_widgets.c
branches/particles-2010/source/blender/editors/interface/resources.c
branches/particles-2010/source/blender/editors/interface/view2d.c
branches/particles-2010/source/blender/editors/interface/view2d_ops.c
branches/particles-2010/source/blender/editors/mesh/CMakeLists.txt
branches/particles-2010/source/blender/editors/mesh/editmesh.c
branches/particles-2010/source/blender/editors/mesh/editmesh_loop.c
branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
branches/particles-2010/source/blender/editors/mesh/mesh_data.c
branches/particles-2010/source/blender/editors/metaball/CMakeLists.txt
branches/particles-2010/source/blender/editors/object/CMakeLists.txt
branches/particles-2010/source/blender/editors/object/object_add.c
branches/particles-2010/source/blender/editors/object/object_bake.c
branches/particles-2010/source/blender/editors/object/object_edit.c
branches/particles-2010/source/blender/editors/object/object_hook.c
branches/particles-2010/source/blender/editors/object/object_modifier.c
branches/particles-2010/source/blender/editors/object/object_relations.c
branches/particles-2010/source/blender/editors/object/object_shapekey.c
branches/particles-2010/source/blender/editors/object/object_transform.c
branches/particles-2010/source/blender/editors/object/object_vgroup.c
branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/physics/physics_fluid.c
branches/particles-2010/source/blender/editors/physics/physics_ops.c
branches/particles-2010/source/blender/editors/physics/physics_pointcache.c
branches/particles-2010/source/blender/editors/render/CMakeLists.txt
branches/particles-2010/source/blender/editors/render/render_intern.h
branches/particles-2010/source/blender/editors/render/render_internal.c
branches/particles-2010/source/blender/editors/render/render_opengl.c
branches/particles-2010/source/blender/editors/render/render_preview.c
branches/particles-2010/source/blender/editors/render/render_shading.c
branches/particles-2010/source/blender/editors/screen/CMakeLists.txt
branches/particles-2010/source/blender/editors/screen/area.c
branches/particles-2010/source/blender/editors/screen/glutil.c
branches/particles-2010/source/blender/editors/screen/screen_edit.c
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/screen/screendump.c
branches/particles-2010/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_intern.h
branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_stroke.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_utils.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/sound/CMakeLists.txt
branches/particles-2010/source/blender/editors/sound/sound_ops.c
branches/particles-2010/source/blender/editors/space_action/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_action/action_select.c
branches/particles-2010/source/blender/editors/space_action/space_action.c
branches/particles-2010/source/blender/editors/space_api/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_api/spacetypes.c
branches/particles-2010/source/blender/editors/space_buttons/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_buttons/buttons_context.c
branches/particles-2010/source/blender/editors/space_buttons/buttons_header.c
branches/particles-2010/source/blender/editors/space_buttons/buttons_intern.h
branches/particles-2010/source/blender/editors/space_buttons/buttons_ops.c
branches/particles-2010/source/blender/editors/space_buttons/space_buttons.c
branches/particles-2010/source/blender/editors/space_console/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_console/console_draw.c
branches/particles-2010/source/blender/editors/space_console/console_ops.c
branches/particles-2010/source/blender/editors/space_file/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_file/file_intern.h
branches/particles-2010/source/blender/editors/space_file/file_ops.c
branches/particles-2010/source/blender/editors/space_file/filelist.c
branches/particles-2010/source/blender/editors/space_file/filesel.c
branches/particles-2010/source/blender/editors/space_file/space_file.c
branches/particles-2010/source/blender/editors/space_graph/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_graph/graph_draw.c
branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
branches/particles-2010/source/blender/editors/space_graph/graph_select.c
branches/particles-2010/source/blender/editors/space_graph/space_graph.c
branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_image/SConscript
branches/particles-2010/source/blender/editors/space_image/image_buttons.c
branches/particles-2010/source/blender/editors/space_image/image_draw.c
branches/particles-2010/source/blender/editors/space_image/image_intern.h
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_image/space_image.c
branches/particles-2010/source/blender/editors/space_info/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_info/info_report.c
branches/particles-2010/source/blender/editors/space_info/info_stats.c
branches/particles-2010/source/blender/editors/space_logic/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_logic/logic_buttons.c
branches/particles-2010/source/blender/editors/space_logic/logic_window.c
branches/particles-2010/source/blender/editors/space_logic/space_logic.c
branches/particles-2010/source/blender/editors/space_nla/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_nla/nla_channels.c
branches/particles-2010/source/blender/editors/space_nla/nla_edit.c
branches/particles-2010/source/blender/editors/space_nla/nla_select.c
branches/particles-2010/source/blender/editors/space_nla/space_nla.c
branches/particles-2010/source/blender/editors/space_node/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_buttons.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_node/node_header.c
branches/particles-2010/source/blender/editors/space_node/node_intern.h
branches/particles-2010/source/blender/editors/space_node/node_ops.c
branches/particles-2010/source/blender/editors/space_node/node_select.c
branches/particles-2010/source/blender/editors/space_node/node_state.c
branches/particles-2010/source/blender/editors/space_node/space_node.c
branches/particles-2010/source/blender/editors/space_outliner/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_outliner/outliner_intern.h
branches/particles-2010/source/blender/editors/space_outliner/outliner_ops.c
branches/particles-2010/source/blender/editors/space_outliner/space_outliner.c
branches/particles-2010/source/blender/editors/space_script/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_script/script_header.c
branches/particles-2010/source/blender/editors/space_sequencer/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_draw.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_intern.h
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_ops.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_select.c
branches/particles-2010/source/blender/editors/space_sequencer/space_sequencer.c
branches/particles-2010/source/blender/editors/space_sound/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_sound/sound_header.c
branches/particles-2010/source/blender/editors/space_text/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_text/text_header.c
branches/particles-2010/source/blender/editors/space_text/text_ops.c
branches/particles-2010/source/blender/editors/space_text/text_python.c
branches/particles-2010/source/blender/editors/space_time/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_time/space_time.c
branches/particles-2010/source/blender/editors/space_userpref/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/drawanimviz.c
branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
branches/particles-2010/source/blender/editors/space_view3d/drawmesh.c
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_buttons.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_intern.h
branches/particles-2010/source/blender/editors/space_view3d/view3d_ops.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_select.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_toolbar.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/CMakeLists.txt
branches/particles-2010/source/blender/editors/transform/transform.c
branches/particles-2010/source/blender/editors/transform/transform.h
branches/particles-2010/source/blender/editors/transform/transform_constraints.c
branches/particles-2010/source/blender/editors/transform/transform_conversions.c
branches/particles-2010/source/blender/editors/transform/transform_generics.c
branches/particles-2010/source/blender/editors/transform/transform_input.c
branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
branches/particles-2010/source/blender/editors/transform/transform_ops.c
branches/particles-2010/source/blender/editors/transform/transform_snap.c
branches/particles-2010/source/blender/editors/util/CMakeLists.txt
branches/particles-2010/source/blender/editors/util/ed_util.c
branches/particles-2010/source/blender/editors/util/editmode_undo.c
branches/particles-2010/source/blender/editors/util/undo.c
branches/particles-2010/source/blender/editors/util/util_intern.h
branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
branches/particles-2010/source/blender/editors/uvedit/uvedit_draw.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/particles-2010/source/blender/gpu/CMakeLists.txt
branches/particles-2010/source/blender/gpu/GPU_buffers.h
branches/particles-2010/source/blender/gpu/GPU_draw.h
branches/particles-2010/source/blender/gpu/GPU_extensions.h
branches/particles-2010/source/blender/gpu/SConscript
branches/particles-2010/source/blender/gpu/intern/gpu_buffers.c
branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
branches/particles-2010/source/blender/gpu/intern/gpu_material.c
branches/particles-2010/source/blender/ikplugin/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/IMB_imbuf.h
branches/particles-2010/source/blender/imbuf/IMB_imbuf_types.h
branches/particles-2010/source/blender/imbuf/SConscript
branches/particles-2010/source/blender/imbuf/intern/IMB_anim.h
branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
branches/particles-2010/source/blender/imbuf/intern/anim_movie.c
branches/particles-2010/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/divers.c
branches/particles-2010/source/blender/imbuf/intern/filter.c
branches/particles-2010/source/blender/imbuf/intern/imageprocess.c
branches/particles-2010/source/blender/imbuf/intern/md5.h
branches/particles-2010/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/particles-2010/source/blender/imbuf/intern/png.c
branches/particles-2010/source/blender/imbuf/intern/rectop.c
branches/particles-2010/source/blender/imbuf/intern/scaling.c
branches/particles-2010/source/blender/imbuf/intern/targa.c
branches/particles-2010/source/blender/imbuf/intern/tiff.c
branches/particles-2010/source/blender/imbuf/intern/util.c
branches/particles-2010/source/blender/makesdna/DNA_ID.h
branches/particles-2010/source/blender/makesdna/DNA_actuator_types.h
branches/particles-2010/source/blender/makesdna/DNA_camera_types.h
branches/particles-2010/source/blender/makesdna/DNA_image_types.h
branches/particles-2010/source/blender/makesdna/DNA_lattice_types.h
branches/particles-2010/source/blender/makesdna/DNA_material_types.h
branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesdna/DNA_object_fluidsim.h
branches/particles-2010/source/blender/makesdna/DNA_object_force.h
branches/particles-2010/source/blender/makesdna/DNA_object_types.h
branches/particles-2010/source/blender/makesdna/DNA_particle_types.h
branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
branches/particles-2010/source/blender/makesdna/DNA_screen_types.h
branches/particles-2010/source/blender/makesdna/DNA_sequence_types.h
branches/particles-2010/source/blender/makesdna/DNA_space_types.h
branches/particles-2010/source/blender/makesdna/DNA_userdef_types.h
branches/particles-2010/source/blender/makesdna/DNA_view3d_types.h
branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
branches/particles-2010/source/blender/makesdna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesdna/intern/makesdna.c
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/RNA_define.h
branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
branches/particles-2010/source/blender/makesrna/RNA_types.h
branches/particles-2010/source/blender/makesrna/SConscript
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/makesrna.c
branches/particles-2010/source/blender/makesrna/intern/rna_ID.c
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_action.c
branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
branches/particles-2010/source/blender/makesrna/intern/rna_brush.c
branches/particles-2010/source/blender/makesrna/intern/rna_camera.c
branches/particles-2010/source/blender/makesrna/intern/rna_cloth.c
branches/particles-2010/source/blender/makesrna/intern/rna_color.c
branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
branches/particles-2010/source/blender/makesrna/intern/rna_controller.c
branches/particles-2010/source/blender/makesrna/intern/rna_curve.c
branches/particles-2010/source/blender/makesrna/intern/rna_define.c
branches/particles-2010/source/blender/makesrna/intern/rna_fcurve.c
branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
branches/particles-2010/source/blender/makesrna/intern/rna_group.c
branches/particles-2010/source/blender/makesrna/intern/rna_image.c
branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
branches/particles-2010/source/blender/makesrna/intern/rna_internal_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_key.c
branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
branches/particles-2010/source/blender/makesrna/intern/rna_lattice.c
branches/particles-2010/source/blender/makesrna/intern/rna_main.c
branches/particles-2010/source/blender/makesrna/intern/rna_main_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_material.c
branches/particles-2010/source/blender/makesrna/intern/rna_mesh.c
branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
branches/particles-2010/source/blender/makesrna/intern/rna_nla.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_object.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
branches/particles-2010/source/blender/makesrna/intern/rna_property.c
branches/particles-2010/source/blender/makesrna/intern/rna_render.c
branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_screen.c
branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
branches/particles-2010/source/blender/makesrna/intern/rna_sequencer_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
branches/particles-2010/source/blender/makesrna/intern/rna_ui.c
branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_world.c
branches/particles-2010/source/blender/modifiers/CMakeLists.txt
branches/particles-2010/source/blender/modifiers/intern/MOD_armature.c
branches/particles-2010/source/blender/modifiers/intern/MOD_array.c
branches/particles-2010/source/blender/modifiers/intern/MOD_bevel.c
branches/particles-2010/source/blender/modifiers/intern/MOD_boolean.c
branches/particles-2010/source/blender/modifiers/intern/MOD_build.c
branches/particles-2010/source/blender/modifiers/intern/MOD_cast.c
branches/particles-2010/source/blender/modifiers/intern/MOD_cloth.c
branches/particles-2010/source/blender/modifiers/intern/MOD_collision.c
branches/particles-2010/source/blender/modifiers/intern/MOD_curve.c
branches/particles-2010/source/blender/modifiers/intern/MOD_decimate.c
branches/particles-2010/source/blender/modifiers/intern/MOD_displace.c
branches/particles-2010/source/blender/modifiers/intern/MOD_edgesplit.c
branches/particles-2010/source/blender/modifiers/intern/MOD_explode.c
branches/particles-2010/source/blender/modifiers/intern/MOD_fluidsim.c
branches/particles-2010/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/particles-2010/source/blender/modifiers/intern/MOD_hook.c
branches/particles-2010/source/blender/modifiers/intern/MOD_lattice.c
branches/particles-2010/source/blender/modifiers/intern/MOD_mask.c
branches/particles-2010/source/blender/modifiers/intern/MOD_meshdeform.c
branches/particles-2010/source/blender/modifiers/intern/MOD_mirror.c
branches/particles-2010/source/blender/modifiers/intern/MOD_multires.c
branches/particles-2010/source/blender/modifiers/intern/MOD_none.c
branches/particles-2010/source/blender/modifiers/intern/MOD_particleinstance.c
branches/particles-2010/source/blender/modifiers/intern/MOD_particlesystem.c
branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
branches/particles-2010/source/blender/modifiers/intern/MOD_shapekey.c
branches/particles-2010/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/particles-2010/source/blender/modifiers/intern/MOD_simpledeform.c
branches/particles-2010/source/blender/modifiers/intern/MOD_smoke.c
branches/particles-2010/source/blender/modifiers/intern/MOD_smooth.c
branches/particles-2010/source/blender/modifiers/intern/MOD_softbody.c
branches/particles-2010/source/blender/modifiers/intern/MOD_solidify.c
branches/particles-2010/source/blender/modifiers/intern/MOD_subsurf.c
branches/particles-2010/source/blender/modifiers/intern/MOD_surface.c
branches/particles-2010/source/blender/modifiers/intern/MOD_util.c
branches/particles-2010/source/blender/modifiers/intern/MOD_util.h
branches/particles-2010/source/blender/modifiers/intern/MOD_uvproject.c
branches/particles-2010/source/blender/modifiers/intern/MOD_warp.c
branches/particles-2010/source/blender/modifiers/intern/MOD_wave.c
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
branches/particles-2010/source/blender/nodes/composite/node_composite_util.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_image.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_math.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
branches/particles-2010/source/blender/nodes/shader/node_shader_tree.c
branches/particles-2010/source/blender/nodes/shader/node_shader_util.h
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_material.c
branches/particles-2010/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/particles-2010/source/blender/python/BPY_extern.h
branches/particles-2010/source/blender/python/CMakeLists.txt
branches/particles-2010/source/blender/python/SConscript
branches/particles-2010/source/blender/python/generic/CMakeLists.txt
branches/particles-2010/source/blender/python/generic/IDProp.c
branches/particles-2010/source/blender/python/generic/IDProp.h
branches/particles-2010/source/blender/python/generic/bgl.c
branches/particles-2010/source/blender/python/generic/bgl.h
branches/particles-2010/source/blender/python/generic/blf_py_api.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.h
branches/particles-2010/source/blender/python/generic/noise_py_api.c
branches/particles-2010/source/blender/python/generic/py_capi_utils.c
branches/particles-2010/source/blender/python/generic/py_capi_utils.h
branches/particles-2010/source/blender/python/intern/CMakeLists.txt
branches/particles-2010/source/blender/python/intern/bpy.c
branches/particles-2010/source/blender/python/intern/bpy.h
branches/particles-2010/source/blender/python/intern/bpy_app.c
branches/particles-2010/source/blender/python/intern/bpy_app.h
branches/particles-2010/source/blender/python/intern/bpy_driver.c
branches/particles-2010/source/blender/python/intern/bpy_interface.c
branches/particles-2010/source/blender/python/intern/bpy_library.c
branches/particles-2010/source/blender/python/intern/bpy_operator.c
branches/particles-2010/source/blender/python/intern/bpy_props.c
branches/particles-2010/source/blender/python/intern/bpy_props.h
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna.h
branches/particles-2010/source/blender/python/intern/bpy_rna_anim.c
branches/particles-2010/source/blender/python/intern/bpy_rna_array.c
branches/particles-2010/source/blender/python/intern/bpy_util.c
branches/particles-2010/source/blender/quicktime/CMakeLists.txt
branches/particles-2010/source/blender/quicktime/apple/qtkit_export.m
branches/particles-2010/source/blender/render/CMakeLists.txt
branches/particles-2010/source/blender/render/SConscript
branches/particles-2010/source/blender/render/extern/include/RE_pipeline.h
branches/particles-2010/source/blender/render/extern/include/RE_shader_ext.h
branches/particles-2010/source/blender/render/intern/include/rayobject.h
branches/particles-2010/source/blender/render/intern/include/render_types.h
branches/particles-2010/source/blender/render/intern/source/convertblender.c
branches/particles-2010/source/blender/render/intern/source/envmap.c
branches/particles-2010/source/blender/render/intern/source/imagetexture.c
branches/particles-2010/source/blender/render/intern/source/pipeline.c
branches/particles-2010/source/blender/render/intern/source/pixelshading.c
branches/particles-2010/source/blender/render/intern/source/pointdensity.c
branches/particles-2010/source/blender/render/intern/source/rayshade.c
branches/particles-2010/source/blender/render/intern/source/render_texture.c
branches/particles-2010/source/blender/render/intern/source/rendercore.c
branches/particles-2010/source/blender/render/intern/source/renderdatabase.c
branches/particles-2010/source/blender/render/intern/source/shadeinput.c
branches/particles-2010/source/blender/render/intern/source/shadeoutput.c
branches/particles-2010/source/blender/render/intern/source/strand.c
branches/particles-2010/source/blender/render/intern/source/sunsky.c
branches/particles-2010/source/blender/render/intern/source/volume_precache.c
branches/particles-2010/source/blender/render/intern/source/volumetric.c
branches/particles-2010/source/blender/render/intern/source/voxeldata.c
branches/particles-2010/source/blender/render/intern/source/zbuf.c
branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
branches/particles-2010/source/blender/windowmanager/SConscript
branches/particles-2010/source/blender/windowmanager/WM_api.h
branches/particles-2010/source/blender/windowmanager/WM_types.h
branches/particles-2010/source/blender/windowmanager/intern/wm.c
branches/particles-2010/source/blender/windowmanager/intern/wm_apple.c
branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/blender/windowmanager/intern/wm_keymap.c
branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
branches/particles-2010/source/blender/windowmanager/intern/wm_subwindow.c
branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
branches/particles-2010/source/blender/windowmanager/wm.h
branches/particles-2010/source/blender/windowmanager/wm_event_types.h
branches/particles-2010/source/blenderplayer/CMakeLists.txt
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/SConscript
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/particles-2010/source/gameengine/Converter/BL_ActionActuator.cpp
branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles-2010/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.cpp
branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.h
branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
branches/particles-2010/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/particles-2010/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/SConscript
branches/particles-2010/source/gameengine/Ketsji/BL_Material.h
branches/particles-2010/source/gameengine/Ketsji/BL_Texture.cpp
branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KX_Camera.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_CameraActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_Light.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PyMath.h
branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_SoundActuator.h
branches/particles-2010/source/gameengine/Ketsji/SConscript
branches/particles-2010/source/gameengine/Network/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/particles-2010/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/common/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/SceneGraph/CMakeLists.txt
branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
branches/particles-2010/source/gameengine/VideoTexture/SConscript
branches/particles-2010/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/particles-2010/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/particles-2010/source/tests/CMakeLists.txt
branches/particles-2010/source/tests/bl_load_py_modules.py
branches/particles-2010/source/tests/bl_run_operators.py
branches/particles-2010/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/particles-2010/build_files/cmake/Modules/FindFftw3.cmake
branches/particles-2010/build_files/cmake/Modules/FindJack.cmake
branches/particles-2010/build_files/cmake/Modules/FindJeMalloc.cmake
branches/particles-2010/build_files/cmake/Modules/FindOpenEXR.cmake
branches/particles-2010/build_files/cmake/Modules/FindOpenJPEG.cmake
branches/particles-2010/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/particles-2010/build_files/cmake/Modules/FindSamplerate.cmake
branches/particles-2010/build_files/cmake/Modules/FindSndFile.cmake
branches/particles-2010/build_files/cmake/Modules/FindSpacenav.cmake
branches/particles-2010/build_files/cmake/cmake_consistency_check_config.py
branches/particles-2010/build_files/cmake/cmake_netbeans_project.py
branches/particles-2010/build_files/cmake/config/
branches/particles-2010/build_files/cmake/config/blender_headless.cmake
branches/particles-2010/build_files/cmake/config/blender_lite.cmake
branches/particles-2010/build_files/cmake/config/bpy_module.cmake
branches/particles-2010/build_files/cmake/project_info.py
branches/particles-2010/doc/python_api/examples/aud.py
branches/particles-2010/doc/python_api/examples/bge.constraints.py
branches/particles-2010/doc/python_api/examples/bge.texture.1.py
branches/particles-2010/doc/python_api/examples/bge.texture.py
branches/particles-2010/doc/python_api/examples/blf.py
branches/particles-2010/doc/python_api/examples/bpy.props.4.py
branches/particles-2010/doc/python_api/rst/bge.constraints.rst
branches/particles-2010/doc/python_api/rst/bge.texture.rst
branches/particles-2010/doc/python_api/rst/bgl.rst
branches/particles-2010/intern/ffmpeg/
branches/particles-2010/intern/ffmpeg/ffmpeg_compat.h
branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemNULL.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemSDL.h
branches/particles-2010/intern/ghost/intern/GHOST_WindowNULL.h
branches/particles-2010/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowSDL.h
branches/particles-2010/intern/ghost/test/CMakeLists.txt
branches/particles-2010/intern/tools/ui_snapshot.py
branches/particles-2010/source/blender/blenlib/BLI_callbacks.h
branches/particles-2010/source/blender/blenlib/intern/callbacks.c
branches/particles-2010/source/blender/editors/render/render_update.c
branches/particles-2010/source/blender/editors/render/render_view.c
branches/particles-2010/source/blender/editors/space_outliner/outliner_draw.c
branches/particles-2010/source/blender/editors/space_outliner/outliner_edit.c
branches/particles-2010/source/blender/editors/space_outliner/outliner_select.c
branches/particles-2010/source/blender/editors/space_outliner/outliner_tools.c
branches/particles-2010/source/blender/editors/space_outliner/outliner_tree.c
branches/particles-2010/source/blender/python/intern/bpy_app_handlers.c
branches/particles-2010/source/blender/python/intern/bpy_app_handlers.h
branches/particles-2010/source/blender/python/intern/bpy_intern_string.c
branches/particles-2010/source/blender/python/intern/bpy_intern_string.h
branches/particles-2010/source/blender/python/mathutils/
branches/particles-2010/source/blender/python/mathutils/CMakeLists.txt
branches/particles-2010/source/blender/python/mathutils/mathutils.c
branches/particles-2010/source/blender/python/mathutils/mathutils.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Color.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Color.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Euler.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Euler.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Matrix.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Matrix.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Quaternion.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Quaternion.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Vector.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Vector.h
branches/particles-2010/source/blender/python/mathutils/mathutils_geometry.c
branches/particles-2010/source/blender/python/mathutils/mathutils_geometry.h
branches/particles-2010/source/blender/windowmanager/WM_keymap.h
branches/particles-2010/source/tests/check_deprecated.py
branches/particles-2010/source/tools/MakeGLStipple.py
Removed Paths:
-------------
branches/particles-2010/build_files/cmake/FindPythonLibsUnix.cmake
branches/particles-2010/build_files/cmake/config/blender_headless.cmake
branches/particles-2010/build_files/cmake/config/blender_lite.cmake
branches/particles-2010/build_files/cmake/config/bpy_module.cmake
branches/particles-2010/doc/python_api/epy/BGL.py
branches/particles-2010/intern/ffmpeg/ffmpeg_compat.h
branches/particles-2010/release/release_todo.txt
branches/particles-2010/source/blender/blenlib/intern/BLI_callbacks.h
branches/particles-2010/source/blender/editors/space_outliner/outliner.c
branches/particles-2010/source/blender/editors/transform/transform_ndofinput.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/
branches/particles-2010/source/blender/nodes/intern/PAR_nodes/
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/
branches/particles-2010/source/blender/python/generic/mathutils.c
branches/particles-2010/source/blender/python/generic/mathutils.h
branches/particles-2010/source/blender/python/generic/mathutils_Color.c
branches/particles-2010/source/blender/python/generic/mathutils_Color.h
branches/particles-2010/source/blender/python/generic/mathutils_Euler.c
branches/particles-2010/source/blender/python/generic/mathutils_Euler.h
branches/particles-2010/source/blender/python/generic/mathutils_Matrix.c
branches/particles-2010/source/blender/python/generic/mathutils_Matrix.h
branches/particles-2010/source/blender/python/generic/mathutils_Quaternion.c
branches/particles-2010/source/blender/python/generic/mathutils_Quaternion.h
branches/particles-2010/source/blender/python/generic/mathutils_Vector.c
branches/particles-2010/source/blender/python/generic/mathutils_Vector.h
branches/particles-2010/source/blender/python/generic/mathutils_geometry.c
branches/particles-2010/source/blender/python/generic/mathutils_geometry.h
branches/particles-2010/source/blender/python/mathutils/CMakeLists.txt
branches/particles-2010/source/blender/python/mathutils/mathutils.c
branches/particles-2010/source/blender/python/mathutils/mathutils.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Color.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Color.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Euler.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Euler.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Matrix.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Matrix.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Quaternion.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Quaternion.h
branches/particles-2010/source/blender/python/mathutils/mathutils_Vector.c
branches/particles-2010/source/blender/python/mathutils/mathutils_Vector.h
branches/particles-2010/source/blender/python/mathutils/mathutils_geometry.c
branches/particles-2010/source/blender/python/mathutils/mathutils_geometry.h
Property Changed:
----------------
branches/particles-2010/
branches/particles-2010/build_files/cmake/cmake_consistency_check.py
branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
branches/particles-2010/source/blender/editors/space_outliner/
branches/particles-2010/source/blender/editors/uvedit/uvedit_buttons.c
branches/particles-2010/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-36657
+ /trunk/blender:33741-39477
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-08-26 06:22:12 UTC (rev 39706)
+++ branches/particles-2010/CMakeLists.txt 2011-08-26 08:13:08 UTC (rev 39707)
@@ -49,39 +49,32 @@
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)
-# ignore system set flag, use our own
-# must be before project(...)
-# if the user wants to add their own its ok after first run.
-if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
- set(_reset_standard_libraries OFF)
-else()
- set(_reset_standard_libraries ON)
-endif()
+#-----------------------------------------------------------------------------
+# Load some macros.
+include(build_files/cmake/macros.cmake)
-project(Blender)
+#-----------------------------------------------------------------------------
+# Initialize project.
+blender_project_hack_pre()
-if (_reset_standard_libraries)
- # Must come after project(...)
- #
- # MINGW workaround for -ladvapi32 being included which surprisingly causes
- # string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
- # with a meaningless stack trace. by overriding this flag we ensure we only
- # have libs we define and that cmake & scons builds match.
- set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
- mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
-endif()
-unset(_reset_standard_libraries)
+project(Blender)
+blender_project_hack_post()
enable_testing()
@@ -92,21 +85,20 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
-# Load some macros.
-include(build_files/cmake/macros.cmake)
-
-#-----------------------------------------------------------------------------
# Set default config options
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)
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
@@ -116,6 +108,22 @@
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+
+# 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)
@@ -133,6 +141,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)
@@ -146,9 +155,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)
@@ -169,6 +179,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)
@@ -202,17 +213,25 @@
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
-# only for developers who want to make this functional
-# option(WITH_LCMS "Enable color correction with lcms" OFF)
+#-----------------------------------------------------------------------------
+# 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()
@@ -226,9 +245,17 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
+if(WITH_CODEC_QUICKTIME AND MINGW)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+endif()
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+ set(WITH_HEADLESS ON)
+endif()
+
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -237,11 +264,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)
@@ -249,13 +292,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
#
@@ -271,65 +313,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
- )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list