[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51854] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 51853.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Nov 4 03:23:00 CET 2012
Revision: 51854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51854
Author: kjym3
Date: 2012-11-04 02:22:56 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 51853.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c
This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51853
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51853
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py
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/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2008-mxcurioni/intern/bsp/extern/CSG_BooleanOps.h
branches/soc-2008-mxcurioni/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.py
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_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf_microfacet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_triangle.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
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/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.h
branches/soc-2008-mxcurioni/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/smoke/intern/smoke_API.cpp
branches/soc-2008-mxcurioni/intern/utfconv/utfconv.h
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.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/source/blender/blenfont/intern/blf_lang.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.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/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.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/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.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/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/navmesh_conversion.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/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.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/unit.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.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/noise.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/blenlib/intern/voronoi.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/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_decimate_collapse.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.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_operators.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.h
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.h
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.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/intern/COM_ExecutionSystem.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.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_GaussianBokehBlurOperation.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_MovieDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2008-mxcurioni/source/blender/datatoc/datatoc.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.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_mask.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
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_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.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/mask/mask_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.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/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
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/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.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_project.c
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/crazyspace.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_buffers.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Common.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/FlipDXT.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
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_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.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_main.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.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_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.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_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_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.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/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.h
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/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_engine.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.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_keymap.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_init_exit.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_playanim.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_subwindow.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/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPOTransform.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterSource.h
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
branches/soc-2008-mxcurioni/source/tests/bl_test.py
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/osl.py
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2008-mxcurioni/source/tools/check_style_c_config.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_int.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_layer_weight.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_light_falloff.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_object_info.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_particle_info.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_rgb_ramp.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_set_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/oslutil.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageLib.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
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-51718
+ /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
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-11-04 02:22:56 UTC (rev 51854)
@@ -186,11 +186,11 @@
# Modifiers
-option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
-option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
-option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
-option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
+option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
+option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
+option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -658,11 +658,7 @@
else()
set(Boost_USE_MULTITHREADED ON)
endif()
- if(WITH_CYCLES_OSL)
- find_package(Boost 1.34 COMPONENTS filesystem python3 regex system thread) # osl_nodes uses boost_python
- else()
- find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
- endif()
+ find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif()
@@ -828,7 +824,7 @@
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
# Solaris CC
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
# Intel C++ Compiler
@@ -1137,12 +1133,6 @@
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_python3-${BOOST_POSTFIX}
- debug libboost_python3-${BOOST_DEBUG_POSTFIX})
- endif(WITH_CYCLES_OSL)
-
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
@@ -1323,12 +1313,6 @@
debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
boost_regex-${BOOST_DEBUG_POSTFIX}
boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
- if(WITH_CYCLES_OSL)
- set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
- optimized libboost_python3-${BOOST_POSTFIX}
- debug libboost_python3-${BOOST_DEBUG_POSTFIX})
- endif(WITH_CYCLES_OSL)
-
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
endif()
@@ -1583,11 +1567,7 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- if(WITH_CYCLES_OSL)
- set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_python3-mt boost_regex-mt boost_system-mt boost_thread-mt)
- else(WITH_CYCLES_OSL)
- set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt)
- endif(WITH_CYCLES_OSL)
+ set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt)
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_DEFINITIONS)
endif()
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2012-11-04 02:22:56 UTC (rev 51854)
@@ -37,7 +37,7 @@
'${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
'/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
'/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
- '/usr/lib/liborc-0.4.a /usr/lib/libasound.a'
+ '/usr/lib/liborc-0.4.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
Property changes on: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2012-11-04 02:22:56 UTC (rev 51854)
@@ -37,7 +37,7 @@
'${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
'/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
'/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
- '/usr/lib/liborc-0.4.a /usr/lib/libasound.a'
+ '/usr/lib/liborc-0.4.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
Property changes on: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-04 02:22:56 UTC (rev 51854)
@@ -23,7 +23,7 @@
'${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
'/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
'/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
- '/usr/lib/liborc-0.4.a /usr/lib/libasound.a'
+ '/usr/lib/liborc-0.4.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
Property changes on: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-04 02:22:56 UTC (rev 51854)
@@ -23,7 +23,7 @@
'${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
'/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
'/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
- '/usr/lib/liborc-0.4.a /usr/lib/libasound.a'
+ '/usr/lib/liborc-0.4.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
Property changes on: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py 2012-11-04 01:32:39 UTC (rev 51853)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py 2012-11-04 02:22:56 UTC (rev 51854)
@@ -81,6 +81,12 @@
elif builder.endswith('linux_glibc27_i386_scons'):
configs = ['user-config-player-glibc27-i686.py',
'user-config-glibc27-i686.py']
+ if builder.endswith('linux_glibc211_x86_64_scons'):
+ configs = ['user-config-player-glibc211-x86_64.py',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list