Blender Git Loki
Git Commits -> Revision d40c8bc
Revision d40c8bc by Antonis Ryakiotakis (soc-2013-paint) August 13, 2013, 18:02 (GMT) |
Merge trunk -r59114 into soc-2013-paint |
Commit Details:
Full Hash: d40c8bc8134183a52e882a761370266fd92d6f84
SVN Revision: 59116
Parent Commit: f295685
Lines Changed: +1598, -580
2 Added Paths:
111 Modified Paths:
/build_files/build_environment/install_deps.sh (+3, -2) (Diff)
/build_files/cmake/cmake_static_check_cppcheck.py (+3, -1) (Diff)
/doc/python_api/rst/bge.logic.rst (+3, -3) (Diff)
/intern/cycles/blender/addon/ui.py (+6, -9) (Diff)
/intern/cycles/blender/blender_object.cpp (+1, -1) (Diff)
/intern/cycles/blender/blender_sync.cpp (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+11, -3) (Diff)
/intern/cycles/device/device_task.h (+1, -0) (Diff)
/intern/cycles/kernel/kernel.cl (+1, -1) (Diff)
/intern/cycles/kernel/kernel.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel.cu (+13, -2) (Diff)
/intern/cycles/kernel/kernel_bvh.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_bvh_traversal.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_curve.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+61, -31) (Diff)
/intern/cycles/kernel/kernel_shader.h (+7, -4) (Diff)
/intern/cycles/kernel/kernel_sse2.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel_sse3.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+7, -8) (Diff)
/intern/cycles/kernel/shaders/node_texture.h (+4, -25) (Diff)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_texture.h (+4, -25) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+0, -6) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+3, -5) (Diff)
/intern/cycles/render/curves.cpp (+1, -1) (Diff)
/intern/cycles/render/graph.cpp (+1, -1) (Diff)
/intern/cycles/render/session.cpp (+2, -1) (Diff)
/intern/cycles/render/svm.cpp (+1, -1) (Diff)
/intern/cycles/render/tile.cpp (+1, -1) (Diff)
/release/scripts/modules/bpy/path.py (+25, -0) (Diff)
/release/scripts/modules/bpy_extras/image_utils.py (+34, -2) (Diff)
/release/scripts/startup/bl_operators/add_mesh_torus.py (+68, -21) (Diff)
/source/blender/avi/intern/avi.c (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_material.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_screen.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/action.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/armature.c (+6, -0) (Diff)
/source/blender/blenkernel/intern/camera.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/curve.c (+31, -3) (Diff)
/source/blender/blenkernel/intern/image.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/mask.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+23, -27) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/screen.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/sound.c (+0, -4) (Diff)
/source/blender/blenlib/BLI_math_base.h (+8, -0) (Diff)
/source/blender/blenlib/intern/BLI_kdtree.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+31, -15) (Diff)
/source/blender/bmesh/bmesh.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_construct.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+22, -16) (Diff)
/source/blender/bmesh/intern/bmesh_core.h (+5, -3) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+77, -7) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_inset.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_split_edges.c (+1, -2) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_subdivide_edgering.c (+0, -1) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+4, -4) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.h (+1, -1) (Diff)
/source/blender/editors/armature/pose_edit.c (+3, -0) (Diff)
/source/blender/editors/interface/interface_draw.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -4) (Diff)
/source/blender/editors/mask/mask_draw.c (+1, -1) (Diff)
/source/blender/editors/mask/mask_ops.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+8, -33) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+12, -11) (Diff)
/source/blender/editors/object/object_edit.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+5, -4) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+6, -1) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+12, -7) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+5, -0) (Diff)
/source/blender/editors/space_time/space_time.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+17, -22) (Diff)
/source/blender/freestyle/intern/geometry/FitCurve.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/stroke/StrokeRep.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapIO.cpp (+2, -2) (Diff)
/source/blender/gpu/GPU_buffers.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+14, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -2) (Diff)
/source/blender/imbuf/intern/bmp.c (+35, -8) (Diff)
/source/blender/makesdna/DNA_image_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_access.c (+5, -5) (Diff)
/source/blender/makesrna/intern/rna_define.c (+5, -17) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+21, -4) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+17, -0) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+1, -2) (Diff)
/source/blender/modifiers/intern/MOD_ocean.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+3, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c (+1, -1) (Diff)
/source/blender/python/bmesh/bmesh_py_utils.c (+4, -8) (Diff)
/source/blender/render/intern/source/convertblender.c (+3, -0) (Diff)
/source/blender/render/intern/source/occlusion.c (+1, -1) (Diff)
/source/blender/render/intern/source/pointdensity.c (+47, -28) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+10, -0) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+5, -1) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.h (+3, -2) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+2, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInitTypes.cpp (+82, -119) (Diff)
/build_files/cmake/cmake_static_check_cppcheck.py (+3, -1) (Diff)
/doc/python_api/rst/bge.logic.rst (+3, -3) (Diff)
/intern/cycles/blender/addon/ui.py (+6, -9) (Diff)
/intern/cycles/blender/blender_object.cpp (+1, -1) (Diff)
/intern/cycles/blender/blender_sync.cpp (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+11, -3) (Diff)
/intern/cycles/device/device_task.h (+1, -0) (Diff)
/intern/cycles/kernel/kernel.cl (+1, -1) (Diff)
/intern/cycles/kernel/kernel.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel.cu (+13, -2) (Diff)
/intern/cycles/kernel/kernel_bvh.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_bvh_traversal.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_curve.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+61, -31) (Diff)
/intern/cycles/kernel/kernel_shader.h (+7, -4) (Diff)
/intern/cycles/kernel/kernel_sse2.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel_sse3.cpp (+6, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+7, -8) (Diff)
/intern/cycles/kernel/shaders/node_texture.h (+4, -25) (Diff)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_texture.h (+4, -25) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+0, -6) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+3, -5) (Diff)
/intern/cycles/render/curves.cpp (+1, -1) (Diff)
/intern/cycles/render/graph.cpp (+1, -1) (Diff)
/intern/cycles/render/session.cpp (+2, -1) (Diff)
/intern/cycles/render/svm.cpp (+1, -1) (Diff)
/intern/cycles/render/tile.cpp (+1, -1) (Diff)
/release/scripts/modules/bpy/path.py (+25, -0) (Diff)
/release/scripts/modules/bpy_extras/image_utils.py (+34, -2) (Diff)
/release/scripts/startup/bl_operators/add_mesh_torus.py (+68, -21) (Diff)
/source/blender/avi/intern/avi.c (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_material.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_screen.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/action.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/armature.c (+6, -0) (Diff)
/source/blender/blenkernel/intern/camera.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/curve.c (+31, -3) (Diff)
/source/blender/blenkernel/intern/image.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/mask.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+23, -27) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/screen.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/sound.c (+0, -4) (Diff)
/source/blender/blenlib/BLI_math_base.h (+8, -0) (Diff)
/source/blender/blenlib/intern/BLI_kdtree.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+31, -15) (Diff)
/source/blender/bmesh/bmesh.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_construct.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+22, -16) (Diff)
/source/blender/bmesh/intern/bmesh_core.h (+5, -3) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+77, -7) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_inset.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_split_edges.c (+1, -2) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_subdivide_edgering.c (+0, -1) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+4, -4) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.h (+1, -1) (Diff)
/source/blender/editors/armature/pose_edit.c (+3, -0) (Diff)
/source/blender/editors/interface/interface_draw.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -4) (Diff)
/source/blender/editors/mask/mask_draw.c (+1, -1) (Diff)
/source/blender/editors/mask/mask_ops.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+8, -33) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+12, -11) (Diff)
/source/blender/editors/object/object_edit.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+5, -4) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+6, -1) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+12, -7) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+5, -0) (Diff)
/source/blender/editors/space_time/space_time.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+17, -22) (Diff)
/source/blender/freestyle/intern/geometry/FitCurve.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/stroke/StrokeRep.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapIO.cpp (+2, -2) (Diff)
/source/blender/gpu/GPU_buffers.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+14, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -2) (Diff)
/source/blender/imbuf/intern/bmp.c (+35, -8) (Diff)
/source/blender/makesdna/DNA_image_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_access.c (+5, -5) (Diff)
/source/blender/makesrna/intern/rna_define.c (+5, -17) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+21, -4) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+17, -0) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+1, -2) (Diff)
/source/blender/modifiers/intern/MOD_ocean.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+3, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c (+1, -1) (Diff)
/source/blender/python/bmesh/bmesh_py_utils.c (+4, -8) (Diff)
/source/blender/render/intern/source/convertblender.c (+3, -0) (Diff)
/source/blender/render/intern/source/occlusion.c (+1, -1) (Diff)
/source/blender/render/intern/source/pointdensity.c (+47, -28) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+10, -0) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+5, -1) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.h (+3, -2) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+2, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInitTypes.cpp (+82, -119) (Diff)