[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57816] branches/soc-2013-depsgraph_mt: Merging r57729 through r57815 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jun 27 11:07:20 CEST 2013
Revision: 57816
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57816
Author: nazgul
Date: 2013-06-27 09:07:19 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Merging r57729 through r57815 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57729
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57815
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.app.translations.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cuda.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_opencl.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_vector.h
branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy/utils.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/console/complete_namespace.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/node.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/presets.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/autoexec.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/effect.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/key.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/fileops.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/graph.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/path_util.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/readfile.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-depsgraph_mt/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editcurve.c
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editfont.c
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/lorem.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_layout.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_regions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/resources.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_opengl.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screen_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screendump.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_file/filesel.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-depsgraph_mt/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-depsgraph_mt/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/util.c
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/envmap.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-depsgraph_mt/source/creator/creator.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2013-depsgraph_mt/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex_proj.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/aabb.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/aabb_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/carve.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/classification.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection_types.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/colour.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/convex_hull.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/csg.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/debug_hooks.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/djset.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/edge_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/edge_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/exact.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/external/boost/random.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/face_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/face_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/faceloop.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom2d.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom3d.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/heap.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/input.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/interpolator.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/intersection.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/iobj.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/kd_node.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/math.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/math_constants.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/matrix.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/mesh.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/mesh_ops.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/mesh_simplify.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/octree_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/octree_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/pointset.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/pointset_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/pointset_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/pointset_iter.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/poly.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/poly_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/poly_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyhedron_base.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyhedron_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyhedron_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyline.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyline_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/polyline_iter.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/rescale.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/rtree.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/spacetree.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/tag.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/timing.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/tree.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/triangulator.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/triangulator_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/util.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/vector.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/vertex_decl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/include/carve/vertex_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/csg_collector.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/csg_data.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/csg_detail.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/intersect_classify_common.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/intersect_classify_common_impl.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/intersect_common.hpp
branches/soc-2013-depsgraph_mt/extern/carve/lib/intersect_debug.hpp
branches/soc-2013-depsgraph_mt/extern/carve/patches/files/random.hpp
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/soc-2013-depsgraph_mt/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-depsgraph_mt/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cu
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-depsgraph_mt/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_buttons.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57728
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57815
Modified: branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh 2013-06-27 07:49:20 UTC (rev 57815)
+++ branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh 2013-06-27 09:07:19 UTC (rev 57816)
@@ -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-depsgraph_mt/doc/python_api/examples/bpy.app.translations.py
===================================================================
--- branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.app.translations.py 2013-06-27 07:49:20 UTC (rev 57815)
+++ branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.app.translations.py 2013-06-27 09:07:19 UTC (rev 57816)
@@ -4,7 +4,7 @@
.. warning::
Most of this object should only be useful if you actually manipulate i18n stuff from Python.
- If you are a regular addon, you should only bother about :const:`contexts` member,
+ If you are a regular addon, you should only bother about :const:`contexts` member,
and the :func:`register`/:func:`unregister` functions! The :func:`pgettext` family of functions
should only be used in rare, specific cases (like e.g. complex "composited" UI strings...).
Modified: branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
===================================================================
--- branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py 2013-06-27 07:49:20 UTC (rev 57815)
+++ branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py 2013-06-27 09:07:19 UTC (rev 57816)
@@ -8,6 +8,7 @@
import bpy
+
def draw(self, context):
self.layout.label("Hello World")
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/aabb.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/aabb_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/carve.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/classification.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/boost_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/std_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection/unordered.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/collection_types.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/colour.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/convex_hull.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/csg.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/csg_triangulator.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/debug_hooks.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/djset.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/edge_decl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/edge_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/exact.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/external/boost/random.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/face_decl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/face_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/faceloop.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom2d.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom3d.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/geom_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/heap.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/input.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-depsgraph_mt/extern/carve/include/carve/interpolator.hpp
___________________________________________________________________
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list