Blender Git Loki
Git Commits -> Revision b913d3e
Revision b913d3e by Antonis Ryakiotakis (soc-2013-paint) August 8, 2013, 09:47 (GMT) |
Merge trunk -r59019 into soc-2013-paint |
Commit Details:
Full Hash: b913d3e068382ab40fb072f96fe1e84f75dbc651
SVN Revision: 59020
Parent Commit: 949017e
Lines Changed: +927, -818
2 Added Paths:
/source/blender/compositor/operations/COM_SplitOperation.cpp (+81, -0) (View)
/source/blender/compositor/operations/COM_SplitOperation.h (+43, -0) (View)
/source/blender/compositor/operations/COM_SplitOperation.h (+43, -0) (View)
4 Deleted Paths:
/source/blender/compositor/operations/COM_SplitViewerOperation.cpp (+0, -92)
/source/blender/compositor/operations/COM_SplitViewerOperation.h (+0, -44)
/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp (+0, -123)
/source/blender/compositor/operations/COM_ViewerBaseOperation.h (+0, -75)
/source/blender/compositor/operations/COM_SplitViewerOperation.h (+0, -44)
/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp (+0, -123)
/source/blender/compositor/operations/COM_ViewerBaseOperation.h (+0, -75)
115 Modified Paths:
/build_files/cmake/cmake_static_check_smatch.py (+3, -1) (Diff)
/build_files/cmake/cmake_static_check_sparse.py (+3, -1) (Diff)
/build_files/cmake/project_source_info.py (+20, -0) (Diff)
/CMakeLists.txt (+4, -0) (Diff)
/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst (+6, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+18, -9) (Diff)
/intern/cycles/kernel/kernel_types.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/render/blackbody.cpp (+4, -4) (Diff)
/intern/dualcon/intern/octree.cpp (+1, -1) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+6, -0) (Diff)
/intern/mikktspace/mikktspace.c (+1, -1) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_spell_check.py (+2, -0) (Diff)
/release/scripts/presets/keyconfig/3dsmax.py (+2, -0) (Diff)
/release/scripts/presets/keyconfig/maya.py (+20, -0) (Diff)
/source/blender/avi/intern/avi_mjpeg.c (+2, -47) (Diff)
/source/blender/blenfont/BLF_api.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_image.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/action.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/constraint.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/curve.c (+62, -54) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/library.c (+4, -7) (Diff)
/source/blender/blenkernel/intern/multires.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+5, -10) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+10, -10) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_buffer.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_memarena.h (+2, -0) (Diff)
/source/blender/blenlib/BLI_mempool.h (+5, -0) (Diff)
/source/blender/blenlib/BLI_string.h (+7, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+4, -0) (Diff)
/source/blender/blenlib/intern/scanfill.c (+4, -4) (Diff)
/source/blender/blenlib/intern/voronoi.c (+2, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+24, -15) (Diff)
/source/blender/blenloader/intern/writefile.c (+31, -11) (Diff)
/source/blender/bmesh/operators/bmo_smooth_laplacian.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_collapse.c (+1, -1) (Diff)
/source/blender/compositor/CMakeLists.txt (+2, -4) (Diff)
/source/blender/compositor/COM_compositor.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionGroup.cpp (+1, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_SplitViewerNode.cpp (+24, -21) (Diff)
/source/blender/compositor/operations/COM_ViewerOperation.cpp (+77, -4) (Diff)
/source/blender/compositor/operations/COM_ViewerOperation.h (+39, -3) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+4, -4) (Diff)
/source/blender/editors/armature/armature_select.c (+3, -3) (Diff)
/source/blender/editors/armature/pose_transform.c (+1, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+5, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_ops.c (+2, -2) (Diff)
/source/blender/editors/mask/mask_select.c (+6, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+57, -8) (Diff)
/source/blender/editors/mesh/meshtools.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+4, -0) (Diff)
/source/blender/editors/object/object_group.c (+50, -42) (Diff)
/source/blender/editors/object/object_hook.c (+2, -2) (Diff)
/source/blender/editors/object/object_vgroup.c (+0, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+1, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+3, -1) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_add.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+6, -6) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+6, -2) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+9, -9) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+1, -1) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp (+1, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+17, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+4, -4) (Diff)
/source/blender/makesrna/intern/SConscript (+0, -6) (Diff)
/source/blender/makesrna/SConscript (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_decimate.c (+2, -0) (Diff)
/source/blender/modifiers/intern/MOD_laplaciansmooth.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_ops.c (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna.c (+1, -1) (Diff)
/source/blender/render/intern/include/zbuf.h (+8, -4) (Diff)
/source/blender/render/intern/source/bake.c (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+53, -46) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -3) (Diff)
/source/blender/render/intern/source/multires_bake.c (+1, -1) (Diff)
/source/blender/render/intern/source/occlusion.c (+3, -3) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -0) (Diff)
/source/blender/render/intern/source/pointdensity.c (+1, -1) (Diff)
/source/blender/render/intern/source/rayshade.c (+9, -9) (Diff)
/source/blender/render/intern/source/render_texture.c (+7, -7) (Diff)
/source/blender/render/intern/source/shadbuf.c (+2, -2) (Diff)
/source/blender/render/intern/source/strand.c (+1, -1) (Diff)
/source/blender/render/intern/source/zbuf.c (+25, -18) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+6, -3) (Diff)
/source/gameengine/Ketsji/KX_Camera.cpp (+30, -0) (Diff)
/source/gameengine/Ketsji/KX_Camera.h (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_MeshProxy.cpp (+1, -1) (Diff)
/build_files/cmake/cmake_static_check_sparse.py (+3, -1) (Diff)
/build_files/cmake/project_source_info.py (+20, -0) (Diff)
/CMakeLists.txt (+4, -0) (Diff)
/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst (+6, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+18, -9) (Diff)
/intern/cycles/kernel/kernel_types.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/render/blackbody.cpp (+4, -4) (Diff)
/intern/dualcon/intern/octree.cpp (+1, -1) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+6, -0) (Diff)
/intern/mikktspace/mikktspace.c (+1, -1) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_spell_check.py (+2, -0) (Diff)
/release/scripts/presets/keyconfig/3dsmax.py (+2, -0) (Diff)
/release/scripts/presets/keyconfig/maya.py (+20, -0) (Diff)
/source/blender/avi/intern/avi_mjpeg.c (+2, -47) (Diff)
/source/blender/blenfont/BLF_api.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_image.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/action.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/constraint.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/curve.c (+62, -54) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/library.c (+4, -7) (Diff)
/source/blender/blenkernel/intern/multires.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+5, -10) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+10, -10) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_buffer.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_memarena.h (+2, -0) (Diff)
/source/blender/blenlib/BLI_mempool.h (+5, -0) (Diff)
/source/blender/blenlib/BLI_string.h (+7, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+4, -0) (Diff)
/source/blender/blenlib/intern/scanfill.c (+4, -4) (Diff)
/source/blender/blenlib/intern/voronoi.c (+2, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+24, -15) (Diff)
/source/blender/blenloader/intern/writefile.c (+31, -11) (Diff)
/source/blender/bmesh/operators/bmo_smooth_laplacian.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_collapse.c (+1, -1) (Diff)
/source/blender/compositor/CMakeLists.txt (+2, -4) (Diff)
/source/blender/compositor/COM_compositor.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionGroup.cpp (+1, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_SplitViewerNode.cpp (+24, -21) (Diff)
/source/blender/compositor/operations/COM_ViewerOperation.cpp (+77, -4) (Diff)
/source/blender/compositor/operations/COM_ViewerOperation.h (+39, -3) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+4, -4) (Diff)
/source/blender/editors/armature/armature_select.c (+3, -3) (Diff)
/source/blender/editors/armature/pose_transform.c (+1, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+5, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_ops.c (+2, -2) (Diff)
/source/blender/editors/mask/mask_select.c (+6, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+57, -8) (Diff)
/source/blender/editors/mesh/meshtools.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+4, -0) (Diff)
/source/blender/editors/object/object_group.c (+50, -42) (Diff)
/source/blender/editors/object/object_hook.c (+2, -2) (Diff)
/source/blender/editors/object/object_vgroup.c (+0, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+1, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+3, -1) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_add.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+6, -6) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+6, -2) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+9, -9) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+1, -1) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp (+1, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+17, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+4, -4) (Diff)
/source/blender/makesrna/intern/SConscript (+0, -6) (Diff)
/source/blender/makesrna/SConscript (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_decimate.c (+2, -0) (Diff)
/source/blender/modifiers/intern/MOD_laplaciansmooth.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_ops.c (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna.c (+1, -1) (Diff)
/source/blender/render/intern/include/zbuf.h (+8, -4) (Diff)
/source/blender/render/intern/source/bake.c (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+53, -46) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -3) (Diff)
/source/blender/render/intern/source/multires_bake.c (+1, -1) (Diff)
/source/blender/render/intern/source/occlusion.c (+3, -3) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -0) (Diff)
/source/blender/render/intern/source/pointdensity.c (+1, -1) (Diff)
/source/blender/render/intern/source/rayshade.c (+9, -9) (Diff)
/source/blender/render/intern/source/render_texture.c (+7, -7) (Diff)
/source/blender/render/intern/source/shadbuf.c (+2, -2) (Diff)
/source/blender/render/intern/source/strand.c (+1, -1) (Diff)
/source/blender/render/intern/source/zbuf.c (+25, -18) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+6, -3) (Diff)
/source/gameengine/Ketsji/KX_Camera.cpp (+30, -0) (Diff)
/source/gameengine/Ketsji/KX_Camera.h (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_MeshProxy.cpp (+1, -1) (Diff)