Blender Git Commit Log
Git Commits -> Revision ae27fd9
Revision ae27fd9 by Antonis Ryakiotakis (soc-2013-paint) June 24, 2013, 13:38 (GMT) |
Merge trunk -r 57692 into soc-2013-paint |
Commit Details:
Full Hash: ae27fd995b1005c319974a7504bf91c7842dbd21
SVN Revision: 57699
Parent Commit: e5085dc
Lines Changed: +1879, -806
1 Added Path:
/source/blender/bmesh/operators/bmo_connect_pair.c (+548, -0) (View)
106 Modified Paths:
/build_files/buildbot/config/user-config-glibc211-i686.py (+2, -0) (Diff)
/build_files/buildbot/config/user-config-glibc211-x86_64.py (+2, -0) (Diff)
/build_files/buildbot/config/user-config-player-glibc211-i686.py (+2, -0) (Diff)
/build_files/buildbot/config/user-config-player-glibc211-x86_64.py (+2, -0) (Diff)
/build_files/buildbot/slave_test.py (+1, -1) (Diff)
/build_files/cmake/macros.cmake (+8, -2) (Diff)
/build_files/scons/config/win32-vc-config.py (+7, -3) (Diff)
/build_files/scons/config/win64-vc-config.py (+1, -2) (Diff)
/build_files/scons/tools/Blender.py (+1, -1) (Diff)
/build_files/scons/tools/btools.py (+4, -4) (Diff)
/doc/python_api/examples/mathutils.Vector.py (+1, -1) (Diff)
/intern/cycles/blender/addon/ui.py (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+3, -3) (Diff)
/intern/cycles/device/device_opencl.cpp (+40, -0) (Diff)
/intern/cycles/kernel/kernel.cl (+22, -3) (Diff)
/intern/cycles/kernel/kernel_displace.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+16, -0) (Diff)
/intern/cycles/kernel/kernel_random.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_types.h (+2, -2) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_color.h (+2, -2) (Diff)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+2, -1) (Diff)
/intern/cycles/kernel/shaders/node_image_texture.osl (+3, -3) (Diff)
/intern/cycles/kernel/shaders/node_texture.h (+3, -3) (Diff)
/intern/cycles/render/graph.cpp (+26, -12) (Diff)
/intern/cycles/render/graph.h (+2, -1) (Diff)
/intern/cycles/render/light.cpp (+2, -2) (Diff)
/intern/cycles/render/nodes.cpp (+11, -2) (Diff)
/intern/cycles/render/nodes.h (+1, -1) (Diff)
/intern/cycles/render/osl.cpp (+0, -3) (Diff)
/intern/cycles/util/util_types.h (+24, -0) (Diff)
/intern/cycles/util/util_vector.h (+19, -12) (Diff)
/intern/locale/boost_locale_wrapper.cpp (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_mask_common.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+4, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+3, -2) (Diff)
/source/blender/blenfont/intern/blf_lang.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_bpath.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_deform.h (+4, -0) (Diff)
/source/blender/blenkernel/intern/armature.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/blender.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/bpath.c (+57, -48) (Diff)
/source/blender/blenkernel/intern/colortools.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/deform.c (+44, -1) (Diff)
/source/blender/blenkernel/intern/mask_rasterize.c (+19, -15) (Diff)
/source/blender/blenlib/BLI_math_rotation.h (+0, -7) (Diff)
/source/blender/blenlib/BLI_smallhash.h (+1, -1) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+12, -9) (Diff)
/source/blender/blenlib/intern/BLI_heap.c (+4, -2) (Diff)
/source/blender/blenlib/intern/BLI_memarena.c (+12, -5) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+4, -2) (Diff)
/source/blender/blenlib/intern/edgehash.c (+14, -12) (Diff)
/source/blender/blenlib/intern/math_geom.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_rotation.c (+0, -29) (Diff)
/source/blender/blenlib/intern/smallhash.c (+6, -3) (Diff)
/source/blender/blenlib/intern/string.c (+1, -1) (Diff)
/source/blender/blenlib/intern/winstuff.c (+1, -1) (Diff)
/source/blender/bmesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+42, -3) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+5, -2) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+21, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operators_private.h (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_connect.c (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+6, -1) (Diff)
/source/blender/editors/include/ED_object.h (+15, -15) (Diff)
/source/blender/editors/mask/mask_ops.c (+11, -3) (Diff)
/source/blender/editors/mesh/editmesh_path.c (+55, -54) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+30, -31) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+20, -3) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/mesh/meshtools.c (+50, -0) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+5, -0) (Diff)
/source/blender/editors/object/object_ops.c (+5, -0) (Diff)
/source/blender/editors/object/object_vgroup.c (+450, -26) (Diff)
/source/blender/editors/space_info/info_ops.c (+7, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+4, -5) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+64, -354) (Diff)
/source/blender/editors/transform/transform.c (+10, -10) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -6) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+4, -4) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+9, -9) (Diff)
/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp (+18, -18) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+2, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+19, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+11, -7) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+14, -2) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+1, -1) (Diff)
/source/blender/nodes/intern/node_socket.c (+2, -0) (Diff)
/source/blender/python/intern/bpy.c (+1, -1) (Diff)
/source/blender/render/intern/source/initrender.c (+4, -3) (Diff)
/source/blender/render/intern/source/voxeldata.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.cpp (+4, -0) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -4) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+3, -1) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_IPO_SGController.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+2, -2) (Diff)
/source/gameengine/VideoTexture/VideoFFmpeg.cpp (+2, -1) (Diff)
/build_files/buildbot/config/user-config-glibc211-x86_64.py (+2, -0) (Diff)
/build_files/buildbot/config/user-config-player-glibc211-i686.py (+2, -0) (Diff)
/build_files/buildbot/config/user-config-player-glibc211-x86_64.py (+2, -0) (Diff)
/build_files/buildbot/slave_test.py (+1, -1) (Diff)
/build_files/cmake/macros.cmake (+8, -2) (Diff)
/build_files/scons/config/win32-vc-config.py (+7, -3) (Diff)
/build_files/scons/config/win64-vc-config.py (+1, -2) (Diff)
/build_files/scons/tools/Blender.py (+1, -1) (Diff)
/build_files/scons/tools/btools.py (+4, -4) (Diff)
/doc/python_api/examples/mathutils.Vector.py (+1, -1) (Diff)
/intern/cycles/blender/addon/ui.py (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+3, -3) (Diff)
/intern/cycles/device/device_opencl.cpp (+40, -0) (Diff)
/intern/cycles/kernel/kernel.cl (+22, -3) (Diff)
/intern/cycles/kernel/kernel_displace.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+16, -0) (Diff)
/intern/cycles/kernel/kernel_random.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_types.h (+2, -2) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_color.h (+2, -2) (Diff)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+2, -1) (Diff)
/intern/cycles/kernel/shaders/node_image_texture.osl (+3, -3) (Diff)
/intern/cycles/kernel/shaders/node_texture.h (+3, -3) (Diff)
/intern/cycles/render/graph.cpp (+26, -12) (Diff)
/intern/cycles/render/graph.h (+2, -1) (Diff)
/intern/cycles/render/light.cpp (+2, -2) (Diff)
/intern/cycles/render/nodes.cpp (+11, -2) (Diff)
/intern/cycles/render/nodes.h (+1, -1) (Diff)
/intern/cycles/render/osl.cpp (+0, -3) (Diff)
/intern/cycles/util/util_types.h (+24, -0) (Diff)
/intern/cycles/util/util_vector.h (+19, -12) (Diff)
/intern/locale/boost_locale_wrapper.cpp (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_mask_common.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+4, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+3, -2) (Diff)
/source/blender/blenfont/intern/blf_lang.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_bpath.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_deform.h (+4, -0) (Diff)
/source/blender/blenkernel/intern/armature.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/blender.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/bpath.c (+57, -48) (Diff)
/source/blender/blenkernel/intern/colortools.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/deform.c (+44, -1) (Diff)
/source/blender/blenkernel/intern/mask_rasterize.c (+19, -15) (Diff)
/source/blender/blenlib/BLI_math_rotation.h (+0, -7) (Diff)
/source/blender/blenlib/BLI_smallhash.h (+1, -1) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+12, -9) (Diff)
/source/blender/blenlib/intern/BLI_heap.c (+4, -2) (Diff)
/source/blender/blenlib/intern/BLI_memarena.c (+12, -5) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+4, -2) (Diff)
/source/blender/blenlib/intern/edgehash.c (+14, -12) (Diff)
/source/blender/blenlib/intern/math_geom.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_rotation.c (+0, -29) (Diff)
/source/blender/blenlib/intern/smallhash.c (+6, -3) (Diff)
/source/blender/blenlib/intern/string.c (+1, -1) (Diff)
/source/blender/blenlib/intern/winstuff.c (+1, -1) (Diff)
/source/blender/bmesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+42, -3) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+5, -2) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+21, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operators_private.h (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_connect.c (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+6, -1) (Diff)
/source/blender/editors/include/ED_object.h (+15, -15) (Diff)
/source/blender/editors/mask/mask_ops.c (+11, -3) (Diff)
/source/blender/editors/mesh/editmesh_path.c (+55, -54) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+30, -31) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+20, -3) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/mesh/meshtools.c (+50, -0) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+5, -0) (Diff)
/source/blender/editors/object/object_ops.c (+5, -0) (Diff)
/source/blender/editors/object/object_vgroup.c (+450, -26) (Diff)
/source/blender/editors/space_info/info_ops.c (+7, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+4, -5) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+64, -354) (Diff)
/source/blender/editors/transform/transform.c (+10, -10) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -6) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+4, -4) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+9, -9) (Diff)
/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp (+18, -18) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+2, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+19, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+11, -7) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+14, -2) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+1, -1) (Diff)
/source/blender/nodes/intern/node_socket.c (+2, -0) (Diff)
/source/blender/python/intern/bpy.c (+1, -1) (Diff)
/source/blender/render/intern/source/initrender.c (+4, -3) (Diff)
/source/blender/render/intern/source/voxeldata.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.cpp (+4, -0) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -4) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+3, -1) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_IPO_SGController.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+2, -2) (Diff)
/source/gameengine/VideoTexture/VideoFFmpeg.cpp (+2, -1) (Diff)