Blender Git Commit Log
Git Commits -> Revision b1f351d
Revision b1f351d by Antonis Ryakiotakis (soc-2013-paint) August 16, 2013, 13:55 (GMT) |
Merge trunk -r59187 into soc-2013-paint |
Commit Details:
Full Hash: b1f351dcb961160d5251083a5d85ff014b31b913
SVN Revision: 59189
Parent Commit: b78a07a
Lines Changed: +4112, -521
9 Added Paths:
/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp (+81, -0) (View)
/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h (+38, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp (+95, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h (+62, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp (+69, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h (+49, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp (+207, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h (+53, -0) (View)
/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c (+64, -0) (View)
/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h (+38, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp (+95, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h (+62, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp (+69, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h (+49, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp (+207, -0) (View)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h (+53, -0) (View)
/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c (+64, -0) (View)
106 Modified Paths:
/build_files/scons/tools/Blender.py (+6, -6) (Diff)
/doc/python_api/rst/bge.logic.rst (+13, -0) (Diff)
/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst (+4, -2) (Diff)
/extern/libmv/libmv-capi.cc (+26, -0) (Diff)
/extern/libmv/libmv-capi.h (+3, -0) (Diff)
/extern/libmv/libmv-capi_stub.cc (+9, -0) (Diff)
/extern/libmv/libmv/multiview/euclidean_resection.cc (+109, -0) (Diff)
/extern/libmv/libmv/multiview/euclidean_resection.h (+4, -0) (Diff)
/extern/libmv/libmv/tracking/track_region.cc (+2, -2) (Diff)
/intern/audaspace/intern/AUD_IHandle.h (+2, -0) (Diff)
/intern/audaspace/intern/AUD_SoftwareDevice.cpp (+47, -39) (Diff)
/intern/audaspace/intern/AUD_SoftwareDevice.h (+2, -0) (Diff)
/intern/audaspace/intern/AUD_Space.h (+2, -1) (Diff)
/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp (+39, -27) (Diff)
/intern/audaspace/OpenAL/AUD_OpenALDevice.h (+2, -0) (Diff)
/intern/audaspace/Python/AUD_PyAPI.cpp (+1, -0) (Diff)
/intern/cycles/kernel/kernel_shader.h (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+3, -4) (Diff)
/intern/guardedalloc/intern/mallocn.c (+2, -2) (Diff)
/release/scripts/modules/bpy_extras/image_utils.py (+9, -1) (Diff)
/release/scripts/startup/bl_operators/add_mesh_torus.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_mask_common.py (+7, -2) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+30, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_curve.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_mask.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_material.h (+5, -4) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+36, -0) (Diff)
/source/blender/blenkernel/intern/armature.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/curve.c (+56, -13) (Diff)
/source/blender/blenkernel/intern/mask.c (+81, -34) (Diff)
/source/blender/blenkernel/intern/material.c (+85, -12) (Diff)
/source/blender/blenkernel/intern/mesh.c (+25, -8) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/tracking.c (+478, -2) (Diff)
/source/blender/blenlib/BLI_array.h (+10, -0) (Diff)
/source/blender/blenlib/BLI_linklist.h (+16, -2) (Diff)
/source/blender/blenlib/intern/BLI_array.c (+42, -0) (Diff)
/source/blender/blenlib/intern/BLI_linklist.c (+77, -9) (Diff)
/source/blender/blenloader/intern/readfile.c (+26, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+19, -2) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+25, -9) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+4, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+125, -1) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_edgenet.c (+76, -91) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+59, -10) (Diff)
/source/blender/compositor/CMakeLists.txt (+9, -0) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_ImageOperation.cpp (+39, -25) (Diff)
/source/blender/compositor/operations/COM_ImageOperation.h (+2, -1) (Diff)
/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp (+6, -6) (Diff)
/source/blender/compositor/operations/COM_ReadBufferOperation.cpp (+15, -2) (Diff)
/source/blender/compositor/operations/COM_ReadBufferOperation.h (+1, -0) (Diff)
/source/blender/compositor/operations/COM_WriteBufferOperation.cpp (+15, -0) (Diff)
/source/blender/compositor/operations/COM_WriteBufferOperation.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+8, -10) (Diff)
/source/blender/editors/mask/mask_relationships.c (+39, -16) (Diff)
/source/blender/editors/mask/mask_shapekey.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+74, -5) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+217, -15) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+2, -4) (Diff)
/source/blender/editors/space_clip/clip_intern.h (+5, -2) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+52, -4) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -0) (Diff)
/source/blender/editors/space_clip/tracking_ops.c (+401, -2) (Diff)
/source/blender/editors/space_clip/tracking_select.c (+243, -14) (Diff)
/source/blender/editors/space_file/file_panels.c (+1, -0) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+36, -0) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+1, -3) (Diff)
/source/blender/editors/transform/transform.c (+7, -8) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+118, -45) (Diff)
/source/blender/editors/transform/transform_generics.c (+11, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+5, -1) (Diff)
/source/blender/makesdna/DNA_mask_types.h (+11, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_tracking_types.h (+54, -1) (Diff)
/source/blender/makesrna/intern/rna_actuator.c (+13, -1) (Diff)
/source/blender/makesrna/intern/rna_curve.c (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+15, -2) (Diff)
/source/blender/makesrna/intern/rna_mask.c (+33, -10) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+239, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_composite.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+2, -0) (Diff)
/source/gameengine/Converter/BL_ActionActuator.cpp (+5, -2) (Diff)
/source/gameengine/Converter/BL_ActionActuator.h (+2, -0) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+11, -14) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.h (+1, -1) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+7, -4) (Diff)
/source/gameengine/Ketsji/BL_Action.h (+11, -3) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.cpp (+4, -2) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.h (+4, -3) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+10, -10) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+16, -7) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+4, -0) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+1, -1) (Diff)
/doc/python_api/rst/bge.logic.rst (+13, -0) (Diff)
/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst (+4, -2) (Diff)
/extern/libmv/libmv-capi.cc (+26, -0) (Diff)
/extern/libmv/libmv-capi.h (+3, -0) (Diff)
/extern/libmv/libmv-capi_stub.cc (+9, -0) (Diff)
/extern/libmv/libmv/multiview/euclidean_resection.cc (+109, -0) (Diff)
/extern/libmv/libmv/multiview/euclidean_resection.h (+4, -0) (Diff)
/extern/libmv/libmv/tracking/track_region.cc (+2, -2) (Diff)
/intern/audaspace/intern/AUD_IHandle.h (+2, -0) (Diff)
/intern/audaspace/intern/AUD_SoftwareDevice.cpp (+47, -39) (Diff)
/intern/audaspace/intern/AUD_SoftwareDevice.h (+2, -0) (Diff)
/intern/audaspace/intern/AUD_Space.h (+2, -1) (Diff)
/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp (+39, -27) (Diff)
/intern/audaspace/OpenAL/AUD_OpenALDevice.h (+2, -0) (Diff)
/intern/audaspace/Python/AUD_PyAPI.cpp (+1, -0) (Diff)
/intern/cycles/kernel/kernel_shader.h (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+3, -4) (Diff)
/intern/guardedalloc/intern/mallocn.c (+2, -2) (Diff)
/release/scripts/modules/bpy_extras/image_utils.py (+9, -1) (Diff)
/release/scripts/startup/bl_operators/add_mesh_torus.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_mask_common.py (+7, -2) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+30, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_curve.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_mask.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_material.h (+5, -4) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+36, -0) (Diff)
/source/blender/blenkernel/intern/armature.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/curve.c (+56, -13) (Diff)
/source/blender/blenkernel/intern/mask.c (+81, -34) (Diff)
/source/blender/blenkernel/intern/material.c (+85, -12) (Diff)
/source/blender/blenkernel/intern/mesh.c (+25, -8) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/tracking.c (+478, -2) (Diff)
/source/blender/blenlib/BLI_array.h (+10, -0) (Diff)
/source/blender/blenlib/BLI_linklist.h (+16, -2) (Diff)
/source/blender/blenlib/intern/BLI_array.c (+42, -0) (Diff)
/source/blender/blenlib/intern/BLI_linklist.c (+77, -9) (Diff)
/source/blender/blenloader/intern/readfile.c (+26, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+19, -2) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+25, -9) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+4, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+125, -1) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_edgenet.c (+76, -91) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+59, -10) (Diff)
/source/blender/compositor/CMakeLists.txt (+9, -0) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_ImageOperation.cpp (+39, -25) (Diff)
/source/blender/compositor/operations/COM_ImageOperation.h (+2, -1) (Diff)
/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp (+6, -6) (Diff)
/source/blender/compositor/operations/COM_ReadBufferOperation.cpp (+15, -2) (Diff)
/source/blender/compositor/operations/COM_ReadBufferOperation.h (+1, -0) (Diff)
/source/blender/compositor/operations/COM_WriteBufferOperation.cpp (+15, -0) (Diff)
/source/blender/compositor/operations/COM_WriteBufferOperation.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+8, -10) (Diff)
/source/blender/editors/mask/mask_relationships.c (+39, -16) (Diff)
/source/blender/editors/mask/mask_shapekey.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+74, -5) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+217, -15) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+2, -4) (Diff)
/source/blender/editors/space_clip/clip_intern.h (+5, -2) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+52, -4) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -0) (Diff)
/source/blender/editors/space_clip/tracking_ops.c (+401, -2) (Diff)
/source/blender/editors/space_clip/tracking_select.c (+243, -14) (Diff)
/source/blender/editors/space_file/file_panels.c (+1, -0) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+36, -0) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+1, -3) (Diff)
/source/blender/editors/transform/transform.c (+7, -8) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+118, -45) (Diff)
/source/blender/editors/transform/transform_generics.c (+11, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+5, -1) (Diff)
/source/blender/makesdna/DNA_mask_types.h (+11, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_tracking_types.h (+54, -1) (Diff)
/source/blender/makesrna/intern/rna_actuator.c (+13, -1) (Diff)
/source/blender/makesrna/intern/rna_curve.c (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+15, -2) (Diff)
/source/blender/makesrna/intern/rna_mask.c (+33, -10) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+239, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_composite.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+2, -0) (Diff)
/source/gameengine/Converter/BL_ActionActuator.cpp (+5, -2) (Diff)
/source/gameengine/Converter/BL_ActionActuator.h (+2, -0) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+11, -14) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.h (+1, -1) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+7, -4) (Diff)
/source/gameengine/Ketsji/BL_Action.h (+11, -3) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.cpp (+4, -2) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.h (+4, -3) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+10, -10) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+16, -7) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+4, -0) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+1, -1) (Diff)