[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33766] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 33765.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Dec 18 12:49:12 CET 2010
Revision: 33766
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33766
Author: kjym3
Date: 2010-12-18 12:49:12 +0100 (Sat, 18 Dec 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 33765.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33765
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libredcode/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzma/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IEvent.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IEventConsumer.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ITimerTask.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Rect.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/iksolver/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/memutil/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/moto/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/opennl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/string/CMakeLists.txt
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-hsv.c
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-yuv.c
branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/import_mdd.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/avi/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sca.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_unit.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image_gen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/animation/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/prvicons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_fileselect.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_shapekey.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
branches/soc-2008-mxcurioni/source/blender/makesdna/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meta_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/quicktime/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/readblenfile/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/intern/include/renderdatabase.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/Makefile
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Network/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2008-mxcurioni/source/kernel/CMakeLists.txt
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/intern/tools/bpy_introspect_ui.py
branches/soc-2008-mxcurioni/intern/tools/dump_rna2xml.py
branches/soc-2008-mxcurioni/release/datafiles/ctodata.py
branches/soc-2008-mxcurioni/release/scripts/templates/background_job.py
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_py_api.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_types.h
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/doc/python_api/alternative/epy/__init__.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/__init__.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/_ast_util.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ast.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/cache.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/codegen.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/exceptions.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/__init__.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/autohandler.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/babelplugin.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/preprocessors.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/pygmentplugin.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/ext/turbogears.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/filters.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/lexer.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/lookup.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/parsetree.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/pygen.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/pyparser.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/runtime.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/template.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/mako/util.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/__init__.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/_constants.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/_native.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/_speedups.py
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/_speedups.so
branches/soc-2008-mxcurioni/doc/python_api/alternative/markupsafe/tests.py
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-12-18 09:46:52 UTC (rev 33765)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-12-18 11:49:12 UTC (rev 33766)
@@ -30,8 +30,8 @@
# build the libs and objects in it. It will also conflict with the current
# Makefile system for Blender
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
Remove the CMakeCache.txt file and try again from another folder, e.g.:
rm CMakeCache.txt
@@ -40,120 +40,126 @@
cd cmake-make
cmake -G \"Unix Makefiles\" ../blender
")
-ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif()
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
# quiet output for Makefiles, 'make -s' helps too
-# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-PROJECT(Blender)
+project(Blender)
#-----------------------------------------------------------------------------
# Redirect output files
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
# Load some macros.
-INCLUDE(build_files/cmake/macros.cmake)
+include(build_files/cmake/macros.cmake)
#-----------------------------------------------------------------------------
# Set default config options
-GET_BLENDER_VERSION()
+get_blender_version()
# Blender internal features
-OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
-OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
-OPTION(WITH_BUILDINFO "Include extra build details" ON)
-OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
-OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
-OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
-OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
-OPTION(WITH_PLAYER "Build Player" OFF)
+option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+option(WITH_PYTHON "Enable Embedded Python API" ON)
+option(WITH_BUILDINFO "Include extra build details" ON)
+option(WITH_IK_ITASC "Enable ITASC IK solver" ON)
+option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
+option(WITH_GAMEENGINE "Enable Game Engine" ON)
+option(WITH_PLAYER "Build Player" OFF)
# (unix defaults to OpenMP On)
-IF(UNIX AND NOT APPLE)
- OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE()
- OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+ option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
+else()
+ option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+endif()
# Modifiers
-OPTION(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
-OPTION(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
-OPTION(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
+option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
# Image format support
-OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
-OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
-OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
-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_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
+option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
+option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
+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)
# Audio/Video format support
-OPTION(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" 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)
-ENDIF(APPLE OR (WIN32 AND NOT UNIX))
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" 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)
+endif()
# 3D format support
# disable opencollada on non-apple unix because opencollada has no package for debian
-IF(UNIX AND NOT APPLE)
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
-ELSE()
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
+else()
+ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
+endif()
# Sound output
-OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
-OPTION(WITH_SAMPLERATE "Enable samplerate conversion" ON)
+option(WITH_SDL "Enable SDL for sound and joystick support" ON)
+option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
+option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
+option(WITH_SAMPLERATE "Enable samplerate conversion" ON)
# Compression
-OPTION(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
-OPTION(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
+option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
+option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
-OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
-OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
+option(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
-IF(APPLE)
- OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
- OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
- OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF(APPLE)
+# Debug
+option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+mark_as_advanced(WITH_CXX_GUARDEDALLOC)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BKE_assert()" OFF)
+mark_as_advanced(WITH_ASSERT_ABORT)
+
+if(APPLE)
+ option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
+ option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
+ option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
+endif()
+
# only for developers who want to make this functional
-# OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
+# option(WITH_LCMS "Enable color correction with lcms" OFF)
-IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
- MESSAGE(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
-ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+ message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
+endif()
-IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
- MESSAGE("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
-ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+ message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
+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")
-ENDIF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+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")
+endif()
-IF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
- MESSAGE(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
-ENDIF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+endif()
TEST_SSE_SUPPORT()
# disabled for now, not supported
-# OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
+# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
@@ -166,78 +172,87 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list