[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37549] branches/soc-2011-carrot: Merge with trunk r37546
Miika Hämäläinen
miika.hamalainen at kolumbus.fi
Thu Jun 16 14:00:04 CEST 2011
Revision: 37549
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37549
Author: miikah
Date: 2011-06-16 12:00:03 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Merge with trunk r37546
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37546
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/buildbot/master.cfg
branches/soc-2011-carrot/build_files/buildbot/master_unpack.py
branches/soc-2011-carrot/build_files/buildbot/slave_compile.py
branches/soc-2011-carrot/build_files/buildbot/slave_pack.py
branches/soc-2011-carrot/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-carrot/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-carrot/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-carrot/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/cmake/project_info.py
branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
branches/soc-2011-carrot/build_files/scons/tools/Blender.py
branches/soc-2011-carrot/build_files/scons/tools/btools.py
branches/soc-2011-carrot/doc/manpage/blender.1
branches/soc-2011-carrot/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/soc-2011-carrot/doc/python_api/rst/bge.logic.rst
branches/soc-2011-carrot/doc/python_api/rst/bge.types.rst
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-carrot/extern/binreloc/CMakeLists.txt
branches/soc-2011-carrot/extern/bullet2/CMakeLists.txt
branches/soc-2011-carrot/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2011-carrot/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2011-carrot/extern/eltopo/CMakeLists.txt
branches/soc-2011-carrot/extern/glew/CMakeLists.txt
branches/soc-2011-carrot/extern/glew/include/GL/glew.h
branches/soc-2011-carrot/extern/glew/include/GL/glxew.h
branches/soc-2011-carrot/extern/glew/include/GL/wglew.h
branches/soc-2011-carrot/extern/glew/src/glew.c
branches/soc-2011-carrot/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-carrot/extern/libredcode/CMakeLists.txt
branches/soc-2011-carrot/extern/lzma/CMakeLists.txt
branches/soc-2011-carrot/extern/lzo/CMakeLists.txt
branches/soc-2011-carrot/intern/audaspace/CMakeLists.txt
branches/soc-2011-carrot/intern/audaspace/SConscript
branches/soc-2011-carrot/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-carrot/intern/boolop/CMakeLists.txt
branches/soc-2011-carrot/intern/bsp/CMakeLists.txt
branches/soc-2011-carrot/intern/bsp/SConscript
branches/soc-2011-carrot/intern/container/CMakeLists.txt
branches/soc-2011-carrot/intern/container/CTR_TaggedIndex.h
branches/soc-2011-carrot/intern/decimation/CMakeLists.txt
branches/soc-2011-carrot/intern/decimation/SConscript
branches/soc-2011-carrot/intern/elbeem/CMakeLists.txt
branches/soc-2011-carrot/intern/elbeem/extern/elbeem.h
branches/soc-2011-carrot/intern/elbeem/intern/simulation_object.cpp
branches/soc-2011-carrot/intern/elbeem/intern/solver_class.h
branches/soc-2011-carrot/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-carrot/intern/elbeem/intern/solver_interface.h
branches/soc-2011-carrot/intern/ghost/CMakeLists.txt
branches/soc-2011-carrot/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2011-carrot/intern/guardedalloc/CMakeLists.txt
branches/soc-2011-carrot/intern/iksolver/CMakeLists.txt
branches/soc-2011-carrot/intern/itasc/CMakeLists.txt
branches/soc-2011-carrot/intern/memutil/CMakeLists.txt
branches/soc-2011-carrot/intern/mikktspace/CMakeLists.txt
branches/soc-2011-carrot/intern/moto/CMakeLists.txt
branches/soc-2011-carrot/intern/opennl/CMakeLists.txt
branches/soc-2011-carrot/intern/smoke/CMakeLists.txt
branches/soc-2011-carrot/intern/string/CMakeLists.txt
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_types.py
branches/soc-2011-carrot/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-carrot/release/scripts/modules/console/intellisense.py
branches/soc-2011-carrot/release/scripts/modules/console_python.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-carrot/source/blender/avi/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/BKE_action.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_brush.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_global.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/SConscript
branches/soc-2011-carrot/source/blender/blenkernel/depsgraph_private.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/action.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/armature.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/brush.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/curve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/deform.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/displist.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/multires.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sca.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/scene.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/text.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_string.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-carrot/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_color.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-carrot/source/blender/blenlib/intern/path_util.c
branches/soc-2011-carrot/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-carrot/source/blender/blenlib/intern/rct.c
branches/soc-2011-carrot/source/blender/blenlib/intern/string.c
branches/soc-2011-carrot/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-carrot/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenpluginapi/iff.h
branches/soc-2011-carrot/source/blender/collada/CMakeLists.txt
branches/soc-2011-carrot/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-carrot/source/blender/collada/EffectExporter.cpp
branches/soc-2011-carrot/source/blender/collada/LightExporter.cpp
branches/soc-2011-carrot/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_markers.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_ops.c
branches/soc-2011-carrot/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-carrot/source/blender/editors/animation/keyingsets.c
branches/soc-2011-carrot/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-carrot/source/blender/editors/armature/poselib.c
branches/soc-2011-carrot/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-carrot/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-carrot/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-carrot/source/blender/editors/include/ED_mesh.h
branches/soc-2011-carrot/source/blender/editors/include/ED_particle.h
branches/soc-2011-carrot/source/blender/editors/include/ED_screen.h
branches/soc-2011-carrot/source/blender/editors/include/ED_types.h
branches/soc-2011-carrot/source/blender/editors/include/ED_util.h
branches/soc-2011-carrot/source/blender/editors/include/ED_view3d.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface_icons.h
branches/soc-2011-carrot/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/interface/interface.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_icons.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_panel.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-carrot/source/blender/editors/interface/resources.c
branches/soc-2011-carrot/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-carrot/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-carrot/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/object/object_add.c
branches/soc-2011-carrot/source/blender/editors/object/object_bake.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_hook.c
branches/soc-2011-carrot/source/blender/editors/object/object_modifier.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/object/object_shapekey.c
branches/soc-2011-carrot/source/blender/editors/object/object_vgroup.c
branches/soc-2011-carrot/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
branches/soc-2011-carrot/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-carrot/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/render/render_internal.c
branches/soc-2011-carrot/source/blender/editors/render/render_view.c
branches/soc-2011-carrot/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/screen/area.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_edit.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-carrot/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_action/action_select.c
branches/soc-2011-carrot/source/blender/editors/space_action/space_action.c
branches/soc-2011-carrot/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-carrot/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_console/console_draw.c
branches/soc-2011-carrot/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_file/file_draw.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_intern.h
branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/filelist.c
branches/soc-2011-carrot/source/blender/editors/space_file/filesel.c
branches/soc-2011-carrot/source/blender/editors/space_file/space_file.c
branches/soc-2011-carrot/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-carrot/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
branches/soc-2011-carrot/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_info/info_report.c
branches/soc-2011-carrot/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-carrot/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-carrot/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_draw.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_intern.h
branches/soc-2011-carrot/source/blender/editors/space_node/node_select.c
branches/soc-2011-carrot/source/blender/editors/space_node/space_node.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-carrot/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_script/script_header.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-carrot/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_sound/sound_header.c
branches/soc-2011-carrot/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-carrot/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/transform/transform.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
branches/soc-2011-carrot/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/util/ed_util.c
branches/soc-2011-carrot/source/blender/editors/util/editmode_undo.c
branches/soc-2011-carrot/source/blender/editors/util/undo.c
branches/soc-2011-carrot/source/blender/editors/util/util_intern.h
branches/soc-2011-carrot/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-carrot/source/blender/gpu/CMakeLists.txt
branches/soc-2011-carrot/source/blender/gpu/GPU_draw.h
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-carrot/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-carrot/source/blender/imbuf/SConscript
branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-carrot/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/intern/divers.c
branches/soc-2011-carrot/source/blender/imbuf/intern/filter.c
branches/soc-2011-carrot/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-carrot/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-carrot/source/blender/imbuf/intern/rectop.c
branches/soc-2011-carrot/source/blender/imbuf/intern/scaling.c
branches/soc-2011-carrot/source/blender/imbuf/intern/targa.c
branches/soc-2011-carrot/source/blender/imbuf/intern/util.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-carrot/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_define.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-carrot/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-carrot/source/blender/nodes/CMakeLists.txt
branches/soc-2011-carrot/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2011-carrot/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2011-carrot/source/blender/nodes/intern/CMP_util.c
branches/soc-2011-carrot/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
branches/soc-2011-carrot/source/blender/python/BPY_extern.h
branches/soc-2011-carrot/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-carrot/source/blender/python/generic/IDProp.c
branches/soc-2011-carrot/source/blender/python/generic/bgl.c
branches/soc-2011-carrot/source/blender/python/generic/bgl.h
branches/soc-2011-carrot/source/blender/python/generic/blf_py_api.c
branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-carrot/source/blender/python/generic/mathutils.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-carrot/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-carrot/source/blender/python/generic/noise_py_api.c
branches/soc-2011-carrot/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/python/intern/bpy.c
branches/soc-2011-carrot/source/blender/python/intern/bpy.h
branches/soc-2011-carrot/source/blender/python/intern/bpy_app.h
branches/soc-2011-carrot/source/blender/python/intern/bpy_driver.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_library.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.h
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.h
branches/soc-2011-carrot/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-carrot/source/blender/render/CMakeLists.txt
branches/soc-2011-carrot/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-carrot/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2011-carrot/source/blender/render/intern/include/render_types.h
branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
branches/soc-2011-carrot/source/blender/render/intern/source/envmap.c
branches/soc-2011-carrot/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
branches/soc-2011-carrot/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-carrot/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
branches/soc-2011-carrot/source/blender/render/intern/source/rendercore.c
branches/soc-2011-carrot/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-carrot/source/blender/render/intern/source/sunsky.c
branches/soc-2011-carrot/source/blender/render/intern/source/volumetric.c
branches/soc-2011-carrot/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-carrot/source/blender/windowmanager/SConscript
branches/soc-2011-carrot/source/blender/windowmanager/WM_api.h
branches/soc-2011-carrot/source/blender/windowmanager/WM_types.h
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-carrot/source/blenderplayer/CMakeLists.txt
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/creator/SConscript
branches/soc-2011-carrot/source/creator/creator.c
branches/soc-2011-carrot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-carrot/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-carrot/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-carrot/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-carrot/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-carrot/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-carrot/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-carrot/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-carrot/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/VideoTexture/SConscript
branches/soc-2011-carrot/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-carrot/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2011-carrot/source/tests/CMakeLists.txt
branches/soc-2011-carrot/source/tests/bl_load_py_modules.py
Added Paths:
-----------
branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenEXR.cmake
branches/soc-2011-carrot/intern/ffmpeg/
branches/soc-2011-carrot/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemNULL.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowNULL.h
Removed Paths:
-------------
branches/soc-2011-carrot/intern/ffmpeg/ffmpeg_compat.h
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/release/scripts/modules/bpy/ops.py
branches/soc-2011-carrot/release/scripts/modules/bpy/utils.py
branches/soc-2011-carrot/release/scripts/presets/sss/chicken.py
branches/soc-2011-carrot/release/scripts/presets/sss/cream.py
branches/soc-2011-carrot/release/scripts/presets/sss/ketchup.py
branches/soc-2011-carrot/release/scripts/presets/sss/marble.py
branches/soc-2011-carrot/release/scripts/presets/sss/potato.py
branches/soc-2011-carrot/release/scripts/presets/sss/skim_milk.py
branches/soc-2011-carrot/release/scripts/presets/sss/skin1.py
branches/soc-2011-carrot/release/scripts/presets/sss/skin2.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-carrot/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-carrot/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-carrot/source/blender/editors/include/ED_particle.h
branches/soc-2011-carrot/source/blender/editors/include/ED_physics.h
branches/soc-2011-carrot/source/blender/editors/include/ED_render.h
branches/soc-2011-carrot/source/blender/editors/include/ED_transform.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-carrot/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_add.c
branches/soc-2011-carrot/source/blender/editors/object/object_constraint.c
branches/soc-2011-carrot/source/blender/editors/object/object_group.c
branches/soc-2011-carrot/source/blender/editors/object/object_hook.c
branches/soc-2011-carrot/source/blender/editors/object/object_lattice.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/object/object_select.c
branches/soc-2011-carrot/source/blender/editors/object/object_shapekey.c
branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
branches/soc-2011-carrot/source/blender/editors/object/object_vgroup.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_boids.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
branches/soc-2011-carrot/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-carrot/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-carrot/source/blender/editors/render/
branches/soc-2011-carrot/source/blender/editors/render/render_intern.h
branches/soc-2011-carrot/source/blender/editors/render/render_preview.c
branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
branches/soc-2011-carrot/source/blender/editors/render/render_update.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_info/info_ops.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_state.c
branches/soc-2011-carrot/source/blender/editors/space_text/text_ops.c
branches/soc-2011-carrot/source/blender/editors/space_userpref/
branches/soc-2011-carrot/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2011-carrot/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2011-carrot/source/blender/editors/space_userpref/userpref_ops.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-carrot/source/blender/gpu/GPU_buffers.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/blender:36828-37548
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-06-16 10:41:00 UTC (rev 37548)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-06-16 12:00:03 UTC (rev 37549)
@@ -55,33 +55,19 @@
# 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,10 +78,6 @@
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()
@@ -106,7 +88,7 @@
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 +98,10 @@
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+
+option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
+mark_as_advanced(WITH_HEADLESS)
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -202,6 +188,9 @@
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -223,9 +212,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()
#-----------------------------------------------------------------------------
@@ -234,6 +231,9 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE "")
+
# these are added to later on.
set(C_WARNINGS "")
set(CXX_WARNINGS "")
@@ -342,23 +342,8 @@
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)
+ find_package(OpenEXR) # our own module
+ if(NOT OPENEXR_FOUND)
set(WITH_IMAGE_OPENEXR OFF)
endif()
endif()
@@ -427,15 +412,19 @@
unset(JEMALLOC)
endif()
- find_package(X11 REQUIRED)
- find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
- mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}")
+ set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(WITH_X11_XINPUT)
- list(APPEND LLIBS ${X11_Xinput_LIB})
+ if(NOT WITH_HEADLESS)
+ find_package(X11 REQUIRED)
+ find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+ mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+ list(APPEND LLIBS ${X11_X11_LIB})
+
+ if(WITH_X11_XINPUT)
+ list(APPEND LLIBS ${X11_Xinput_LIB})
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -639,10 +628,7 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC80)
- set(MSVC_LIB _vs2005)
- set(MSVC_INC)
- elseif(MSVC90)
+ if(MSVC90)
set(MSVC_LIB _vs2008)
set(MSVC_INC)
elseif(MSVC10)
@@ -652,11 +638,24 @@
set(MSVC_LIB msvc)
set(MSVC_INC)
endif()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set(OPENEXR_LIBRARIES
+ ${OPENEXR_LIBPATH}/Iex.lib
+ ${OPENEXR_LIBPATH}/Half.lib
+ ${OPENEXR_LIBPATH}/IlmImf.lib
+ ${OPENEXR_LIBPATH}/Imath.lib
+ ${OPENEXR_LIBPATH}/IlmThread.lib
+ )
set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
- set(OPENEXR_INC ${OPENEXR_INCUDE}/ ${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
+ set(OPENEXR_INCLUDE_DIRS
+ ${OPENEXR_INCUDE}
+ ${OPENEXR_INCUDE}/IlmImf
+ ${OPENEXR_INCUDE}/Iex
+ ${OPENEXR_INCUDE}/Imath
+ )
+ unset(OPENEXR_INCUDE)
+ unset(OPENEXR_LIBPATH)
endif()
if(WITH_IMAGE_TIFF)
@@ -755,8 +754,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/gcc/openexr)
- set(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIB Half IlmImf Imath IlmThread)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
# TODO, gives linking errors, force off
@@ -888,8 +887,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
@@ -984,6 +983,12 @@
#-----------------------------------------------------------------------------
# Common.
+if(APPLE OR WIN32)
+ if(NOT IS_DIRECTORY "${LIBDIR}")
+ message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'")
+ endif()
+endif()
+
if(WITH_RAYOPTIMIZATION)
if(CMAKE_COMPILER_IS_GNUCC)
if(SUPPORT_SSE_BUILD)
@@ -1031,7 +1036,7 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
-blender_include_dirs("${OPENGL_INCLUDE_DIR}")
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
@@ -1144,9 +1149,9 @@
#-------------------------------------------------------------------------------
# Global Defines
-# better not define flags here but this is a debugging option thats off by default.
+# better not set includes here but this debugging option is off by default.
if(WITH_CXX_GUARDEDALLOC)
- set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+ include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
endif()
if(WITH_ASSERT_ABORT)
Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile 2011-06-16 10:41:00 UTC (rev 37548)
+++ branches/soc-2011-carrot/GNUmakefile 2011-06-16 12:00:03 UTC (rev 37549)
@@ -64,21 +64,19 @@
# Build Blender
all:
- @echo
+ @echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- mkdir -p $(BUILD_DIR) ; \
- cd $(BUILD_DIR) ; \
- cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
fi
- @echo
+ @echo
@echo Building Blender ...
- cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
- @echo
+ make -C $(BUILD_DIR) -s -j $(NPROCS) install
+ @echo
@echo run blender from "$(BUILD_DIR)/bin/blender"
- @echo
+ @echo
debug: all
# pass
@@ -91,7 +89,7 @@
cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
package_archive:
- cd $(BUILD_DIR) ; make -s package_archive
+ make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
# forward build targets
@@ -109,6 +107,6 @@
@echo "written: test_cmake_consistency.log"
clean:
- cd $(BUILD_DIR) ; make clean
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list