Blender Git Commit Log
Git Commits -> Revision 24ce60c
Revision 24ce60c by Sergey Sharybin (master) August 16, 2013, 09:46 (GMT) |
Merge plane track feature from tomato branch This commit includes all the changes made for plane tracker in tomato branch. Movie clip editor changes: - Artist might create a plane track out of multiple point tracks which belongs to the same track (minimum amount of point tracks is 4, maximum is not actually limited). When new plane track is added, it's getting "tracked" across all point tracks, which makes it stick to the same plane point tracks belong to. - After plane track was added, it need to be manually adjusted in a way it covers feature one might to mask/replace. General transform tools (G, R, S) or sliding corners with a mouse could be sued for this. Plane corner which corresponds to left bottom image corner has got X/Y axis on it (red is for X axis, green for Y). - Re-adjusting plane corners makes plane to be "re-tracked" for the frames sequence between current frame and next and previous keyframes. - Kayframes might be removed from the plane, using Shit-X (Marker Delete) operator. However, currently manual re-adjustment or "re-track" trigger is needed. Compositor changes: - Added new node called Plane Track Deform. - User selects which plane track to use (for this he need to select movie clip datablock, object and track names). - Node gets an image input, which need to be warped into the plane. - Node outputs: * Input image warped into the plane. * Plane, rasterized to a mask. Masking changes: - Mask points might be parented to a plane track, which makes this point deforming in a way as if it belongs to the tracked plane. Some video tutorials are available: - Coder video: https://www.youtube.com/watch?v=vISEwqNHqe4 - Artist video: https://vimeo.com/71727578 This is mine and Keir's holiday code project :) |
Commit Details:
Full Hash: 24ce60cfe4511534e57a2dea3f24579c74bbdd29
SVN Revision: 59176
Parent Commit: cab2aef
Lines Changed: +3013, -151
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)
39 Modified Paths:
/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)
/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_mask.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+36, -0) (Diff)
/source/blender/blenkernel/intern/mask.c (+81, -34) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/tracking.c (+478, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+25, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+17, -0) (Diff)
/source/blender/compositor/CMakeLists.txt (+9, -0) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+4, -0) (Diff)
/source/blender/editors/mask/mask_relationships.c (+39, -16) (Diff)
/source/blender/editors/mask/mask_shapekey.c (+1, -0) (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_node/drawnode.c (+36, -0) (Diff)
/source/blender/editors/transform/transform.c (+6, -1) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+118, -41) (Diff)
/source/blender/editors/transform/transform_generics.c (+11, -0) (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_mask.c (+33, -10) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+297, -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)
/extern/libmv/libmv-capi.h (+3, -0) (Diff)
/extern/libmv/libmv-capi_stub.cc (+9, -0) (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_mask.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+36, -0) (Diff)
/source/blender/blenkernel/intern/mask.c (+81, -34) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/tracking.c (+478, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+25, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+17, -0) (Diff)
/source/blender/compositor/CMakeLists.txt (+9, -0) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+4, -0) (Diff)
/source/blender/editors/mask/mask_relationships.c (+39, -16) (Diff)
/source/blender/editors/mask/mask_shapekey.c (+1, -0) (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_node/drawnode.c (+36, -0) (Diff)
/source/blender/editors/transform/transform.c (+6, -1) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+118, -41) (Diff)
/source/blender/editors/transform/transform_generics.c (+11, -0) (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_mask.c (+33, -10) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+297, -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)
Master Commits
MiikaHweb | 2003-2021