[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42341] branches/soc-2011-onion-uv-tools: Merge with trunk 42340

Antony Riakiotakis kalast at gmail.com
Fri Dec 2 16:07:22 CET 2011


Revision: 42341
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42341
Author:   psy-fi
Date:     2011-12-02 15:07:20 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Merge with trunk 42340

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/GNUmakefile
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/master.cfg
    branches/soc-2011-onion-uv-tools/build_files/buildbot/slave_pack.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/python_api/examples/bge.texture.1.py
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/gpu.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/extern/libmv/SConscript
    branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/sad.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv-capi.cpp
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv-capi.h
    branches/soc-2011-onion-uv-tools/intern/cycles/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/cycles/SConscript
    branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.h
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device.h
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel.cl
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_globals.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-onion-uv-tools/intern/cycles/render/filter.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/render/mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.h
    branches/soc-2011-onion-uv-tools/intern/cycles/render/session.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/subd/subd_mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_cache.h
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_path.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_path.h
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_system.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-onion-uv-tools/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2011-onion-uv-tools/intern/tools/credits_svn_gen.py
    branches/soc-2011-onion-uv-tools/release/datafiles/fonts/droidsans.ttf.gz
    branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/console/complete_calltip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/keyingsets_builtins.py
    branches/soc-2011-onion-uv-tools/release/text/readme.html
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_scene.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_Customdata.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/action.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bmesh_private.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/camera.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lamp.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ocean.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/speaker.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/world.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_vector.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/winstuff.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.h
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-onion-uv-tools/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/InstanceWriter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/reeb.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_object.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_render.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_interface.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_style.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_update.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/area.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_console/space_console.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filelist.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filelist.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/fsmenu.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/util/ed_util.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/util/undo.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_draw.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_material.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jpeg.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_define.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_group.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_speaker.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_composite.h
    branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_shader.h
    branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_texture.h
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/idprop_py_api.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_library.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_traceback.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/gpu.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_engine.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/render_types.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_api.h
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/creator.c
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/Texture.cpp
    branches/soc-2011-onion-uv-tools/source/tests/pep8.py

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/simple_pipeline/callbacks.cc
    branches/soc-2011-onion-uv-tools/extern/libmv/libmv/simple_pipeline/callbacks.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/SConscript
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
    branches/soc-2011-onion-uv-tools/release/scripts/presets/camera/Nikon_D3S.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_settings/
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_noise.h

Removed Paths:
-------------
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/xml.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/camera/Nikon_D35.py
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/noise_py_api.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/noise_py_api.h

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39665-42050
   + /branches/soc-2011-cucumber:37517
/trunk/blender:39665-42340

Modified: branches/soc-2011-onion-uv-tools/GNUmakefile
===================================================================
--- branches/soc-2011-onion-uv-tools/GNUmakefile	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/GNUmakefile	2011-12-02 15:07:20 UTC (rev 42341)
@@ -93,6 +93,17 @@
 
 
 # -----------------------------------------------------------------------------
+# Tool for 'make config'
+
+# X11 spesific
+ifdef DISPLAY
+	CMAKE_CONFIG_TOOL = cmake-gui
+else 
+	CMAKE_CONFIG_TOOL = ccmake
+endif
+
+
+# -----------------------------------------------------------------------------
 # Build Blender
 all:
 	@echo
@@ -115,8 +126,15 @@
 headless: all
 bpy: all
 
+
 # -----------------------------------------------------------------------------
-# Helo for build targets
+# Configuration (save some cd'ing around)
+config:
+	$(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+
+
+# -----------------------------------------------------------------------------
+# Help for build targets
 help:
 	@echo ""
 	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
@@ -125,6 +143,8 @@
 	@echo "  * headless  - build without an interface (renderfarm or server automation)"
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo ""
+	@echo "  * config    - run cmake configuration tool to set build options"
+	@echo ""
 	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
 	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
 	@echo ""

Modified: branches/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2011-12-02 15:07:20 UTC (rev 42341)
@@ -581,6 +581,14 @@
             source.remove('CMakeLists.txt')
             source=['intern/cycles/doc/license/'+s for s in source]
             scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # cuda binaries
+            if env['WITH_BF_CYCLES_CUDA_BINARIES']:
+                dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')
+                for arch in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
+                    kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
+                    cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
+                    scriptinstall.append(env.Install(dir=dir,source=cubin_file))
     
     if env['WITH_BF_INTERNATIONAL']:
         internationalpaths=['release' + os.sep + 'datafiles']

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py	2011-12-02 15:07:20 UTC (rev 42341)
@@ -58,6 +58,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py	2011-12-02 15:07:20 UTC (rev 42341)
@@ -52,6 +52,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -93,5 +95,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py	2011-12-02 15:07:20 UTC (rev 42341)
@@ -48,6 +48,8 @@
 BF_JPEG_LIB = 'libjpeg'
 BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_PNG = True
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
@@ -93,5 +95,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py	2011-12-02 15:07:20 UTC (rev 42341)
@@ -58,6 +58,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/master.cfg	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/master.cfg	2011-12-02 15:07:20 UTC (rev 42341)
@@ -75,14 +75,14 @@
         return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
 
 
-def lib_svn_step(dir):
-    return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
+def lib_svn_step(libdir):
+    return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir)
 
 # generic builder
 
 
-def generic_builder(id, libdir='', branch=''):
-    filename = 'buildbot_upload_' + id + '.zip'
+def generic_builder(idname, libdir='', branch=''):
+    filename = 'buildbot_upload_' + idname + '.zip'
     compile_script = '../blender/build_files/buildbot/slave_compile.py'
     test_script = '../blender/build_files/buildbot/slave_test.py'
     pack_script = '../blender/build_files/buildbot/slave_pack.py'
@@ -93,10 +93,10 @@
     if libdir != '':
         f.addStep(lib_svn_step(libdir))
 
-    f.addStep(Compile(command=['python', compile_script, id]))
-    f.addStep(Test(command=['python', test_script, id]))
-    f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
-    if id.find('cmake') != -1:
+    f.addStep(Compile(command=['python', compile_script, idname]))
+    f.addStep(Test(command=['python', test_script, idname]))
+    f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged'))
+    if 'cmake' in idname:
         f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
     else:
         f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/slave_pack.py	2011-12-02 14:26:28 UTC (rev 42340)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/slave_pack.py	2011-12-02 15:07:20 UTC (rev 42341)
@@ -84,12 +84,12 @@
         sys.exit(retcode)
 
 # clean release directory if it already exists
-dir = 'release'
+release_dir = 'release'
 
-if os.path.exists(dir):
-    for f in os.listdir(dir):
-        if os.path.isfile(os.path.join(dir, f)):
-            os.remove(os.path.join(dir, f))
+if os.path.exists(release_dir):
+    for f in os.listdir(release_dir):
+        if os.path.isfile(os.path.join(release_dir, f)):
+            os.remove(os.path.join(release_dir, f))
 
 # create release package
 try:
@@ -99,16 +99,16 @@
     sys.exit(1)
 
 # find release directory, must exist this time
-if not os.path.exists(dir):
-    sys.stderr.write("Failed to find release directory.\n")
+if not os.path.exists(release_dir):
+    sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
     sys.exit(1)
 
 # find release package
 file = None
 filepath = None
 
-for f in os.listdir(dir):
-    rf = os.path.join(dir, f)
+for f in os.listdir(release_dir):
+    rf = os.path.join(release_dir, f)
     if os.path.isfile(rf) and f.startswith('blender'):
         file = f
         filepath = rf

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list