[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54427] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 54421.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 10 11:18:00 CET 2013
Revision: 54427
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54427
Author: kjym3
Date: 2013-02-10 10:17:59 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54421
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check_config.py
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_headless.cmake
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
branches/soc-2008-mxcurioni/build_files/cmake/config/bpy_module.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.UIList.py
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/carve/lib/intersect_face_division.cpp
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/SConscript
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_curves.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/device/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/SConscript
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/render/curves.h
branches/soc-2008-mxcurioni/intern/cycles/render/image.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/image.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/light.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.h
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemNULL.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemSDL.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2008-mxcurioni/release/datafiles/matcaps/license.txt
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc01.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc02.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc03.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc04.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc05.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc06.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc07.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc08.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc09.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc10.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc11.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc12.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc13.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc14.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc15.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc16.jpg
branches/soc-2008-mxcurioni/release/datafiles/preview_cycles.blend
branches/soc-2008-mxcurioni/release/datafiles/startup.blend
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/back_to_black.xml
branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/blender_24x.xml
branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/elsyiun.xml
branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/hexagon.xml
branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/rigidbody.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/templates_py/ui_list.py
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_camera.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lamp.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mask.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_rigidbody.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_speaker.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_world.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.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/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.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/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lamp.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/mask.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_rasterize.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/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.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/paint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/speaker.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/world.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.h
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/ControllerExporter.cpp
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/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.h
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.h
branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/compositor/SConscript
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.h
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_datafiles.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
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_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/io/io_collada.c
branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/physics/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_object.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.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/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.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/info_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_group.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PythonInterpreter.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_rigidbody_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.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_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.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_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_intern_string.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_intern_string.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/bake.c
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/pixelblending.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
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_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/EmptyValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CharacterWrapper.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkMessage.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_ICharacter.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IMotionState.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2008-mxcurioni/source/tests/batch_import.py
branches/soc-2008-mxcurioni/source/tools/CTS/FBlender.py
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
branches/soc-2008-mxcurioni/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen_monkeypatch.py
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2008-mxcurioni/intern/opencl/
branches/soc-2008-mxcurioni/intern/rigidbody/
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc17.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc18.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc19.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc20.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc21.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc22.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc23.jpg
branches/soc-2008-mxcurioni/release/datafiles/matcaps/mc24.jpg
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2008-mxcurioni/source/blender/collada/ImportSettings.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ImportSettings.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WrapOperation.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
branches/soc-2008-mxcurioni/source/blender/opencl/
branches/soc-2008-mxcurioni/source/blender/rigidbody/
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-54171
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-54421
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2013-02-10 09:56:05 UTC (rev 54426)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2013-02-10 10:17:59 UTC (rev 54427)
@@ -271,6 +271,9 @@
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
+option(WITH_BOOST "Enable features depending no boost" ON)
+
+
if(APPLE)
cmake_minimum_required(VERSION 2.8.8)
cmake_policy(VERSION 2.8.8)
@@ -398,9 +401,22 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles, booleans, audaspace or i18n
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
- set(WITH_BOOST ON)
+# enable boost for cycles, booleans, audaspace or i18n
+# otherwise if the user disabled
+if(NOT WITH_BOOST)
+ # Explicitly disabled. so disable all deps.
+ set(WITH_CYCLES OFF)
+ set(WITH_MOD_BOOLEAN OFF)
+ set(WITH_AUDASPACE OFF)
+ set(WITH_INTERNATIONAL OFF)
+
+ set(WITH_OPENAL OFF) # depends on AUDASPACE
+ set(WITH_GAMEENGINE OFF) # depends on AUDASPACE
+elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+ # Keep enabled
+else()
+ # Enabled but we don't need it
+ set(WITH_BOOST OFF)
endif()
# auto enable llvm for cycles_osl
@@ -800,7 +816,11 @@
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
if(WITH_X11_XINPUT)
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+ if(X11_Xinput_LIB)
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+ else()
+ set(WITH_X11_XINPUT OFF)
+ endif()
endif()
if(WITH_X11_XF86VMODE)
@@ -1139,11 +1159,16 @@
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
debug libboost_regex-${BOOST_DEBUG_POSTFIX}
debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(WITH_CYCLES_OSL)
+ set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+ optimized libboost_wave-${BOOST_POSTFIX}
+ debug libboost_wave-${BOOST_DEBUG_POSTFIX})
+ endif()
if(WITH_INTERNATIONAL)
set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
optimized libboost_locale-${BOOST_POSTFIX}
debug libboost_locale-${BOOST_DEBUG_POSTFIX})
- endif(WITH_INTERNATIONAL)
+ endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
@@ -1449,11 +1474,11 @@
# module must be compiled against Python framework
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2)
+ set(PYTHON_VERSION 3.3)
set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
#set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.2m")
+ set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled
endif()
@@ -2167,12 +2192,10 @@
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
+ # debug
+ message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
+
info_cfg_text("")
message("${_config_msg}")
endif()
-
-# debug
-message(
- STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}"
-)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2013-02-10 09:56:05 UTC (rev 54426)
+++ branches/soc-2008-mxcurioni/SConstruct 2013-02-10 10:17:59 UTC (rev 54427)
@@ -592,6 +592,14 @@
data_to_c_simple("release/datafiles/matcaps/mc14.jpg")
data_to_c_simple("release/datafiles/matcaps/mc15.jpg")
data_to_c_simple("release/datafiles/matcaps/mc16.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc17.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc18.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc19.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc20.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc21.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc22.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc23.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc24.jpg")
##### END DATAFILES ##########
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check_config.py 2013-02-10 09:56:05 UTC (rev 54426)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check_config.py 2013-02-10 10:17:59 UTC (rev 54427)
@@ -29,6 +29,22 @@
"extern/recastnavigation/Recast/Source/RecastTimer.cpp",
"intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
"intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+ "intern/cycles/render/film_response.cpp",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc",
+ "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -47,6 +63,11 @@
"extern/recastnavigation/Recast/Include/RecastTimer.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
"intern/audaspace/SRC/AUD_SRCResampleReader.h",
+ "intern/cycles/render/film_response.h",
+ "extern/carve/include/carve/config.h",
+ "extern/carve/include/carve/external/boost/random.hpp",
+ "extern/carve/patches/files/config.h",
+ "extern/carve/patches/files/random.hpp",
)
UTF8_CHECK = True
Modified: branches/soc-2008-mxcurioni/build_files/cmake/config/blender_headless.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/config/blender_headless.cmake 2013-02-10 09:56:05 UTC (rev 54426)
+++ branches/soc-2008-mxcurioni/build_files/cmake/config/blender_headless.cmake 2013-02-10 10:17:59 UTC (rev 54427)
@@ -5,19 +5,19 @@
# cmake -C../blender/build_files/cmake/config/blender_headless.cmake ../blender
#
-set(WITH_HEADLESS ON CACHE FORCE BOOL)
-set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
+set(WITH_HEADLESS ON CACHE BOOL "" FORCE)
+set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE)
# disable audio, its possible some devs may want this but for now disable
# so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
-set(WITH_FFTW3 OFF CACHE FORCE BOOL)
-set(WITH_JACK OFF CACHE FORCE BOOL)
-set(WITH_SDL OFF CACHE FORCE BOOL)
-set(WITH_OPENAL OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
+set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE)
+set(WITH_FFTW3 OFF CACHE BOOL "" FORCE)
+set(WITH_JACK OFF CACHE BOOL "" FORCE)
+set(WITH_SDL OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL OFF CACHE BOOL "" FORCE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list