[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54805] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 54802.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 24 04:39:26 CET 2013
Revision: 54805
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54805
Author: kjym3
Date: 2013-02-24 03:39:20 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Merged changes in the trunk up to revision 54802.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54802
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/doc/license/bf-members.txt
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/SConscript
branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_dynlib.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/rigidbody/RBI_api.h
branches/soc-2008-mxcurioni/intern/rigidbody/rb_bullet_api.cpp
branches/soc-2008-mxcurioni/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py
branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.c
branches/soc-2008-mxcurioni/release/datafiles/splash.png
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/spell_check_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/object_utils.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_ui/__init__.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.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_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/templates_py/operator_modal_timer.py
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.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_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.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/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.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/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.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/rigidbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.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/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.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/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
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/bmesh/bmesh_class.h
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/operators/bmo_bevel.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.h
branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.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/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.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/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.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/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.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/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
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_group.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_boids.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.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_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.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_snap.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_constraints.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_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/iris.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_listBase.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_rigidbody_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.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_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.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_rigidbody.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.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/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehblur.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_boxmask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_brightness.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_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_flip.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_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapValue.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_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_pixelate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.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/multires_bake.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
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/BL_KetsjiEmbedStart.cpp
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_ConvertSensors.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_LibLoadStatus.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayCast.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdGraphicController.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/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_ICharacter.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IVehicle.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
branches/soc-2008-mxcurioni/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoConvert.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.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/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
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-54594
+ /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,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-54802
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2013-02-24 02:39:38 UTC (rev 54804)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2013-02-24 03:39:20 UTC (rev 54805)
@@ -124,6 +124,10 @@
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
+if (APPLE)
+ option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
+endif()
+
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
@@ -242,6 +246,10 @@
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
+ if(WITH_STATIC_LIBS)
+ option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF)
+ mark_as_advanced(WITH_BOOST_ICU)
+ endif()
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
@@ -253,7 +261,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -682,7 +690,7 @@
list(APPEND __boost_packages locale)
endif()
find_package(Boost 1.48 COMPONENTS ${__boost_packages})
- if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
+ if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
find_package(IcuLinux)
endif()
mark_as_advanced(Boost_DIR) # why doesnt boost do this?
@@ -1460,11 +1468,10 @@
endif()
if(WITH_PYTHON)
- if(NOT WITH_PYTHON_MODULE)
- # we use precompiled libraries for py 3.3 and up by default
-
+ # we use precompiled libraries for py 3.3 and up by default
+ set(PYTHON_VERSION 3.3)
+ if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.3)
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
set(PYTHON_LIBRARY python${PYTHON_VERSION}m)
@@ -1472,9 +1479,6 @@
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
else()
# module must be compiled against Python framework
-
- # normally cached but not since we include them with blender
- 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})
@@ -1576,8 +1580,8 @@
set(WITH_INPUT_NDOF OFF) # unsupported
endif()
- if(WITH_PYTHON_MODULE)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/python")# force cmake to link right framework
+ if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework
endif()
if(WITH_OPENCOLLADA)
@@ -2185,6 +2189,9 @@
info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
info_cfg_option(WITH_PYTHON_MODULE)
info_cfg_option(WITH_PYTHON_SAFETY)
+ if(APPLE)
+ info_cfg_option(WITH_PYTHON_FRAMEWORK)
+ endif()
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
Modified: branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2013-02-24 02:39:38 UTC (rev 54804)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2013-02-24 03:39:20 UTC (rev 54805)
@@ -188,7 +188,7 @@
OCIO_FORCE_REBUILD=false
OCIO_SKIP=false
-OIIO_VERSION="1.1.1"
+OIIO_VERSION="1.1.7"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/tarball/Release-$OIIO_VERSION"
OIIO_VERSION_MIN="1.1"
OIIO_FORCE_REBUILD=false
@@ -203,8 +203,8 @@
LLVM_SKIP=false
# OSL needs to be compiled for now!
-OSL_VERSION="1.2.0"
-OSL_SOURCE="https://github.com/mont29/OpenShadingLanguage/archive/blender-fixes.tar.gz"
+OSL_VERSION="1.3.0"
+OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.3.0.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -780,27 +780,6 @@
tar -C $SRC --transform "s,(.*/?)OpenImageIO-oiio[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" \
-xf $_src.tar.gz
- cd $_src
-
- # XXX Ugly patching hack!
- cat << EOF | patch -p1
-diff --git a/src/libutil/SHA1.cpp b/src/libutil/SHA1.cpp
-index b9e6c8b..c761185 100644
---- a/src/libutil/SHA1.cpp
-+++ b/src/libutil/SHA1.cpp
-@@ -8,9 +8,9 @@
-
- // If compiling with MFC, you might want to add #include "StdAfx.h"
-
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
-
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000
-EOF
-
cd $CWD
fi
@@ -1991,7 +1970,7 @@
INFO " $_2"
_buildargs="$_buildargs $_1 $_2"
elif $ALL_STATIC; then
- _1="-D Boost_USE_ICU=ON"
+ _1="-D WITH_BOOST_ICU=ON"
INFO " $_1"
_buildargs="$_buildargs $_1"
fi
@@ -2054,6 +2033,10 @@
INFO "BF_OIIO = '$INST/oiio'"
fi
+ if [ -d $INST/osl ]; then
+ INFO "BF_OSL = '$INST/osl'"
+ fi
+
if [ -d $INST/boost ]; then
INFO "BF_BOOST = '$INST/boost'"
INFO "WITH_BF_BOOST = True"
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-02-24 02:39:38 UTC (rev 54804)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-02-24 03:39:20 UTC (rev 54805)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-02-24 02:39:38 UTC (rev 54804)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-02-24 03:39:20 UTC (rev 54805)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2013-02-24 02:39:38 UTC (rev 54804)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2013-02-24 03:39:20 UTC (rev 54805)
@@ -315,7 +315,7 @@
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
#Freestyle
WITH_BF_FREESTYLE = True
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list