[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57869] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Sat Jun 29 04:34:20 CEST 2013


Revision: 57869
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57869
Author:   gdh
Date:     2013-06-29 02:34:19 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
Merged trunk into branch. Includes r57625 to r57864.\n\nThis commit comes after a week of being unable to compile. There is\nquite a bit of merging here. Some things may have been lost due to the\nfact that I had to do a clean checkout to get the compile working.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57625
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57864

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
    branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/soc-2013-cycles_mblur/build_files/buildbot/slave_test.py
    branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
    branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py
    branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py
    branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py
    branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
    branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.app.translations.py
    branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    branches/soc-2013-cycles_mblur/doc/python_api/examples/mathutils.Vector.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_displace.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_random.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/SConscript
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_bump.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_color.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_texture.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_wavelength.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_brick.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_wavelength.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_wireframe.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/background.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/background.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/graph.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/graph.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/light.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/osl.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/scene.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/session.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_math.h
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_vector.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-cycles_mblur/intern/locale/boost_locale_wrapper.cpp
    branches/soc-2013-cycles_mblur/release/datafiles/startup.blend
    branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/utils.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/console/complete_namespace.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/nodeitems_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/anim.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/presets.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/view3d.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/nodeitems_builtins.py
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/ramp_closure.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/temperature_to_rgb.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/wavelength_to_rgb.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/westin_closure.osl
    branches/soc-2013-cycles_mblur/release/text/readme.html
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf.c
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bpath.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_deform.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_global.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mball.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_particle.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_screen.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/autoexec.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/bpath.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/colortools.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/effect.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_smallhash.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/graph.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/path_util.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/scanfill.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/winstuff.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh_conv.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_poke.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/soc-2013-cycles_mblur/source/blender/collada/AnimationExporter.cpp
    branches/soc-2013-cycles_mblur/source/blender/collada/AnimationExporter.h
    branches/soc-2013-cycles_mblur/source/blender/collada/SkinInfo.cpp
    branches/soc-2013-cycles_mblur/source/blender/compositor/SConscript
    branches/soc-2013-cycles_mblur/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_relations.c
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_skinning.c
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/curve_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/editfont.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/lorem.c
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_object.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_screen.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_panel.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_style.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_bevel.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_inset.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_path.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/metaball/mball_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_hook.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_lattice.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_relations.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_shapekey.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-cycles_mblur/source/blender/editors/physics/physics_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/screendump.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_action/space_action.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_api/spacetypes.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_console/space_console.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filesel.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/space_file.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/space_graph.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/space_image.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_info/info_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_info/space_info.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/space_logic.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/space_nla.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/space_node.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_script/script_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_script/space_script.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_text/space_text.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_time/space_time.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.h
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/util/undo.c
    branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/SConscript
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-cycles_mblur/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2013-cycles_mblur/source/blender/ikplugin/intern/ikplugin_api.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/thumbs.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/util.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_key_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_key.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/intern/node_socket.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_wavelength.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_wireframe.c
    branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy.c
    branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2013-cycles_mblur/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/envmap.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/initrender.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/voxeldata.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_types.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-cycles_mblur/source/creator/creator.c
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2013-cycles_mblur/source/tests/bl_run_operators.py
    branches/soc-2013-cycles_mblur/source/tools/spell_check_source.py

Added Paths:
-----------
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_pair.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex_proj.c

Removed Paths:
-------------
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/script.c

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/aabb.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/aabb_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/carve.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/classification.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/boost_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/std_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection/unordered.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/collection_types.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/colour.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/convex_hull.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/csg.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/csg_triangulator.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/debug_hooks.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/djset.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/edge_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/edge_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/exact.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/external/boost/random.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/face_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/face_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/faceloop.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/geom.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/geom2d.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/geom3d.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/geom_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/heap.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/input.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/interpolator.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/intersection.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/iobj.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/kd_node.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/math.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/math_constants.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/matrix.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/mesh.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/mesh_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/mesh_ops.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/mesh_simplify.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/octree_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/octree_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/pointset.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/pointset_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/pointset_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/pointset_iter.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/poly.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/poly_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/poly_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyhedron_base.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyhedron_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyhedron_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyline.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyline_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyline_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/polyline_iter.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/rescale.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/rtree.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/spacetree.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/tag.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/timing.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/tree.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/triangulator.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/triangulator_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/util.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/vector.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/vertex_decl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/include/carve/vertex_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/csg_collector.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/csg_data.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/csg_detail.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/intersect_classify_common.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/intersect_classify_common_impl.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/intersect_common.hpp
    branches/soc-2013-cycles_mblur/extern/carve/lib/intersect_debug.hpp
    branches/soc-2013-cycles_mblur/extern/carve/patches/files/random.hpp
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
    branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
    branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cu
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_wavelength.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_wavelength.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_wireframe.h
    branches/soc-2013-cycles_mblur/release/scripts/modules/nodeitems_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/nodeitems_builtins.py
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/ramp_closure.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/temperature_to_rgb.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/wavelength_to_rgb.osl
    branches/soc-2013-cycles_mblur/release/scripts/templates_osl/westin_closure.osl
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_color_blend.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_color_blend_inline.c
    branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_buttons.h
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_wavelength.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_wireframe.c


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57624
   + /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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57867

Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh	2013-06-29 02:34:19 UTC (rev 57869)
@@ -229,7 +229,7 @@
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.3.0"
+OSL_VERSION="1.3.2"
 OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
@@ -1527,7 +1527,7 @@
 
 compile_OSL() {
   # To be changed each time we make edits that would modify the compiled result!
-  osl_magic=9
+  osl_magic=10
   _init_osl
 
   # Clean install if needed!

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-i686.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-i686.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -55,6 +55,8 @@
 WITH_BF_FREETYPE_STATIC = False
 
 WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
 WITH_BF_STATICOPENEXR = True
 
 WITH_BF_TIFF = True

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -55,6 +55,8 @@
 WITH_BF_FREETYPE_STATIC = False
 
 WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
 WITH_BF_STATICOPENEXR = True
 
 WITH_BF_TIFF = True

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-i686.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-i686.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -40,6 +40,8 @@
 WITH_BF_FREETYPE_STATIC = False
 
 WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
 WITH_BF_STATICOPENEXR = True
 
 WITH_BF_TIFF = True

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-x86_64.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-player-glibc211-x86_64.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -40,6 +40,8 @@
 WITH_BF_FREETYPE_STATIC = False
 
 WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
 WITH_BF_STATICOPENEXR = True
 
 WITH_BF_TIFF = True

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/slave_test.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/slave_test.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/slave_test.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -31,7 +31,7 @@
 # we run from build/ directory
 blender_dir = '../blender'
 
-if builder.find('cmake') != -1:
+if "cmake" in builder:
     # cmake
     retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
     sys.exit(retcode)

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-06-29 02:34:19 UTC (rev 57869)
@@ -401,8 +401,14 @@
 		set(${_sse_flags} "-msse")
 		set(${_sse2_flags} "-msse2")
 	elseif(MSVC)
-		set(${_sse_flags} "/arch:SSE")
-		set(${_sse2_flags} "/arch:SSE2")
+		# x86_64 has this auto enabled
+		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+			set(${_sse_flags} "")
+			set(${_sse2_flags} "")
+		else()
+			set(${_sse_flags} "/arch:SSE")
+			set(${_sse2_flags} "/arch:SSE2")
+		endif()
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		set(${_sse_flags} "")  # icc defaults to -msse
 		set(${_sse2_flags} "-msse2")

Modified: branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -1,4 +1,15 @@
-LCGDIR = '#../lib/windows'
+import subprocess
+
+CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+CL_STDOUT, CL_STDERR = CL_OUT.communicate()
+
+if "17.00." in CL_STDERR:
+    VC_VERSION = '11.0'
+    LCGDIR = '#../lib/windows_vc11'
+else:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/windows'
+
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_FFMPEG = True
@@ -189,8 +200,13 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
+# Workaround for ptxas.exe crash on VS2012 and cuda 5.5
+if VC_VERSION == '11.0':
+	BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+else:
+	BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']

Modified: branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -1,4 +1,15 @@
-LCGDIR = '#../lib/win64'
+import subprocess
+
+CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+CL_STDOUT, CL_STDERR = CL_OUT.communicate()
+
+if "17.00." in CL_STDERR:
+    VC_VERSION = '11.0'
+    LCGDIR = '#../lib/win64_vc11'
+else:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/win64'
+
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_FFMPEG = True

Modified: branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -847,7 +847,7 @@
 
         def list_substring(quickie, libname):
             for q in quickie:
-                if libname.find(q) != -1:
+                if q in libname:
                     return True
             return False
 

Modified: branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-06-29 01:48:20 UTC (rev 57868)
+++ branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-06-29 02:34:19 UTC (rev 57869)
@@ -674,10 +674,10 @@
     if platform == 'linux':
         import platform
 
-        if env['BF_INSTALLDIR'].find('glibc27') != -1:
-            glibc="glibc27"
-        elif env['BF_INSTALLDIR'].find('glibc211') != -1:
-            glibc="glibc211"
+        if "glibc27" in env['BF_INSTALLDIR']:
+            glibc = "glibc27"
+        elif "glibc211" in env['BF_INSTALLDIR']:
+            glibc = "glibc211"
 
         bitness = platform.architecture()[0]
         if bitness == '64bit':

Modified: branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.app.translations.py
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list