[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57769] branches/soc-2013-dingto: Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Wed Jun 26 13:46:56 CEST 2013
Revision: 57769
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57769
Author: dingto
Date: 2013-06-26 11:46:55 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/build_files/buildbot/slave_test.py
branches/soc-2013-dingto/build_files/scons/config/win32-vc-config.py
branches/soc-2013-dingto/build_files/scons/config/win64-vc-config.py
branches/soc-2013-dingto/build_files/scons/tools/Blender.py
branches/soc-2013-dingto/build_files/scons/tools/btools.py
branches/soc-2013-dingto/doc/python_api/examples/mathutils.Vector.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_session.cpp
branches/soc-2013-dingto/intern/cycles/render/graph.cpp
branches/soc-2013-dingto/intern/cycles/render/graph.h
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.h
branches/soc-2013-dingto/intern/cycles/render/session.cpp
branches/soc-2013-dingto/release/datafiles/startup.blend
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_bpath.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_global.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-dingto/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/autoexec.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/blender.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/deform.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/key.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mball.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-dingto/source/blender/blenlib/intern/fileops.c
branches/soc-2013-dingto/source/blender/blenlib/intern/graph.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-dingto/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-dingto/source/blender/collada/AnimationExporter.h
branches/soc-2013-dingto/source/blender/collada/SkinInfo.cpp
branches/soc-2013-dingto/source/blender/compositor/SConscript
branches/soc-2013-dingto/source/blender/editors/curve/curve_ops.c
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/include/ED_object.h
branches/soc-2013-dingto/source/blender/editors/include/ED_screen.h
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_layout.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_panel.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_style.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/metaball/mball_ops.c
branches/soc-2013-dingto/source/blender/editors/object/object_add.c
branches/soc-2013-dingto/source/blender/editors/object/object_intern.h
branches/soc-2013-dingto/source/blender/editors/object/object_ops.c
branches/soc-2013-dingto/source/blender/editors/object/object_shapekey.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/physics/physics_ops.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
branches/soc-2013-dingto/source/blender/editors/screen/area.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-dingto/source/blender/editors/space_action/space_action.c
branches/soc-2013-dingto/source/blender/editors/space_api/spacetypes.c
branches/soc-2013-dingto/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-dingto/source/blender/editors/space_console/space_console.c
branches/soc-2013-dingto/source/blender/editors/space_file/filesel.c
branches/soc-2013-dingto/source/blender/editors/space_file/space_file.c
branches/soc-2013-dingto/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-dingto/source/blender/editors/space_image/space_image.c
branches/soc-2013-dingto/source/blender/editors/space_info/info_ops.c
branches/soc-2013-dingto/source/blender/editors/space_info/space_info.c
branches/soc-2013-dingto/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-dingto/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-dingto/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_draw.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_edit.c
branches/soc-2013-dingto/source/blender/editors/space_node/space_node.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-dingto/source/blender/editors/space_script/space_script.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-dingto/source/blender/editors/space_text/space_text.c
branches/soc-2013-dingto/source/blender/editors/space_text/text_ops.c
branches/soc-2013-dingto/source/blender/editors/space_time/space_time.c
branches/soc-2013-dingto/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.h
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_ops.c
branches/soc-2013-dingto/source/blender/editors/util/undo.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-dingto/source/blender/freestyle/SConscript
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-dingto/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-dingto/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-dingto/source/blender/imbuf/intern/util.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2013-dingto/source/blender/nodes/intern/node_socket.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-dingto/source/blender/python/intern/bpy.c
branches/soc-2013-dingto/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.c
branches/soc-2013-dingto/source/blender/windowmanager/WM_types.h
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-dingto/source/creator/creator.c
branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2013-dingto/source/tools/spell_check_source.py
Removed Paths:
-------------
branches/soc-2013-dingto/source/blender/blenkernel/intern/script.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/extern/carve/include/carve/aabb.hpp
branches/soc-2013-dingto/extern/carve/include/carve/aabb_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/carve.hpp
branches/soc-2013-dingto/extern/carve/include/carve/classification.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection.hpp
branches/soc-2013-dingto/extern/carve/include/carve/collection_types.hpp
branches/soc-2013-dingto/extern/carve/include/carve/colour.hpp
branches/soc-2013-dingto/extern/carve/include/carve/convex_hull.hpp
branches/soc-2013-dingto/extern/carve/include/carve/csg.hpp
branches/soc-2013-dingto/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2013-dingto/extern/carve/include/carve/debug_hooks.hpp
branches/soc-2013-dingto/extern/carve/include/carve/djset.hpp
branches/soc-2013-dingto/extern/carve/include/carve/edge_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/edge_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/exact.hpp
branches/soc-2013-dingto/extern/carve/include/carve/external/boost/random.hpp
branches/soc-2013-dingto/extern/carve/include/carve/face_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/face_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/faceloop.hpp
branches/soc-2013-dingto/extern/carve/include/carve/geom.hpp
branches/soc-2013-dingto/extern/carve/include/carve/geom2d.hpp
branches/soc-2013-dingto/extern/carve/include/carve/geom3d.hpp
branches/soc-2013-dingto/extern/carve/include/carve/geom_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/heap.hpp
branches/soc-2013-dingto/extern/carve/include/carve/input.hpp
branches/soc-2013-dingto/extern/carve/include/carve/interpolator.hpp
branches/soc-2013-dingto/extern/carve/include/carve/intersection.hpp
branches/soc-2013-dingto/extern/carve/include/carve/iobj.hpp
branches/soc-2013-dingto/extern/carve/include/carve/kd_node.hpp
branches/soc-2013-dingto/extern/carve/include/carve/math.hpp
branches/soc-2013-dingto/extern/carve/include/carve/math_constants.hpp
branches/soc-2013-dingto/extern/carve/include/carve/matrix.hpp
branches/soc-2013-dingto/extern/carve/include/carve/mesh.hpp
branches/soc-2013-dingto/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/mesh_ops.hpp
branches/soc-2013-dingto/extern/carve/include/carve/mesh_simplify.hpp
branches/soc-2013-dingto/extern/carve/include/carve/octree_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/octree_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/pointset.hpp
branches/soc-2013-dingto/extern/carve/include/carve/pointset_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/pointset_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/pointset_iter.hpp
branches/soc-2013-dingto/extern/carve/include/carve/poly.hpp
branches/soc-2013-dingto/extern/carve/include/carve/poly_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/poly_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyhedron_base.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyhedron_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyhedron_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyline.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyline_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/polyline_iter.hpp
branches/soc-2013-dingto/extern/carve/include/carve/rescale.hpp
branches/soc-2013-dingto/extern/carve/include/carve/rtree.hpp
branches/soc-2013-dingto/extern/carve/include/carve/spacetree.hpp
branches/soc-2013-dingto/extern/carve/include/carve/tag.hpp
branches/soc-2013-dingto/extern/carve/include/carve/timing.hpp
branches/soc-2013-dingto/extern/carve/include/carve/tree.hpp
branches/soc-2013-dingto/extern/carve/include/carve/triangulator.hpp
branches/soc-2013-dingto/extern/carve/include/carve/triangulator_impl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/util.hpp
branches/soc-2013-dingto/extern/carve/include/carve/vector.hpp
branches/soc-2013-dingto/extern/carve/include/carve/vertex_decl.hpp
branches/soc-2013-dingto/extern/carve/include/carve/vertex_impl.hpp
branches/soc-2013-dingto/extern/carve/lib/csg_collector.hpp
branches/soc-2013-dingto/extern/carve/lib/csg_data.hpp
branches/soc-2013-dingto/extern/carve/lib/csg_detail.hpp
branches/soc-2013-dingto/extern/carve/lib/intersect_classify_common.hpp
branches/soc-2013-dingto/extern/carve/lib/intersect_classify_common_impl.hpp
branches/soc-2013-dingto/extern/carve/lib/intersect_common.hpp
branches/soc-2013-dingto/extern/carve/lib/intersect_debug.hpp
branches/soc-2013-dingto/extern/carve/patches/files/random.hpp
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/soc-2013-dingto/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-dingto/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cl
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu
branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-dingto/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2013-dingto/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2013-dingto/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2013-dingto/source/blender/editors/include/ED_buttons.h
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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:57315-57365,57369-57670
+ /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:57315-57365,57369-57767
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-26 11:46:55 UTC (rev 57769)
@@ -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
Modified: branches/soc-2013-dingto/build_files/buildbot/slave_test.py
===================================================================
--- branches/soc-2013-dingto/build_files/buildbot/slave_test.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/buildbot/slave_test.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -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-dingto/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/config/win32-vc-config.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/scons/config/win32-vc-config.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -3,10 +3,9 @@
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-if CL_STDERR.find("Version 15.00.") == -1:
+if "17.00." in CL_STDERR:
VC_VERSION = '11.0'
LCGDIR = '#../lib/windows_vc11'
-
else:
VC_VERSION = '9.0'
LCGDIR = '#../lib/windows'
@@ -215,8 +214,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-dingto/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/config/win64-vc-config.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/scons/config/win64-vc-config.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -3,10 +3,9 @@
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-if CL_STDERR.find("Version 15.00.") == -1:
+if "17.00." in CL_STDERR:
VC_VERSION = '11.0'
LCGDIR = '#../lib/win64_vc11'
-
else:
VC_VERSION = '9.0'
LCGDIR = '#../lib/win64'
Modified: branches/soc-2013-dingto/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/tools/Blender.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/scons/tools/Blender.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -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-dingto/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -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-dingto/doc/python_api/examples/mathutils.Vector.py
===================================================================
--- branches/soc-2013-dingto/doc/python_api/examples/mathutils.Vector.py 2013-06-26 11:39:48 UTC (rev 57768)
+++ branches/soc-2013-dingto/doc/python_api/examples/mathutils.Vector.py 2013-06-26 11:46:55 UTC (rev 57769)
@@ -4,7 +4,7 @@
vec = mathutils.Vector((0.0, 0.0, 1.0))
# unit length vector
-vec_a = vec.copy().normalize()
+vec_a = vec.normalized()
vec_b = mathutils.Vector((0.0, 1.0, 2.0))
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/aabb.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/aabb_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/carve.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/classification.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/boost_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/std_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection/unordered.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/collection_types.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/colour.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/convex_hull.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/csg.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/csg_triangulator.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-dingto/extern/carve/include/carve/debug_hooks.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list