Blender Git Loki
Git Commits -> Revision 6e0332f
Revision 6e0332f by Sergey Sharybin (master) June 10, 2011, 17:06 (GMT) |
Camera tracking integration =========================== - Disallow moving pattern/search area in way when marker position is outside of pattern area. - MoiveClip could be set as background for 3D view. Added background source property to BGPic to switch between image and movie. Movie is a bit more complicaated entity than clip (due to displaying bundles, test objects and so) that's why i've sliptted background into two sources. - Added Layout.template_movieclip to display general clip settings. Used in Footage panel of SpaceClip and background image properties in 3d view. - Display bundles in 3D view as spheres. Selection is synchronized to markers associated with this bundle. Bundle can't be selected in 3D view. - Recoded internal DNA structures, RNA and operators to match libmv entities. Tracking data now consists of Tracks, each tracks consists of markers which are associated with frame number. Markers holds position only, pattern and search areas settings are stored in track. Such settings should be unified for all markers in track and marker should hold position and frame number only. |
Commit Details:
Full Hash: 6e0332fd40ab2d8e0574af30c02f081a68e77681
SVN Revision: 37374
Parent Commit: eb57876
Lines Changed: +969, -380
32 Modified Paths:
/release/scripts/startup/bl_ui/space_clip.py (+1, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+21, -4) (Diff)
/source/blender/blenkernel/BKE_movieclip.h (+3, -3) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+17, -9) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+20, -12) (Diff)
/source/blender/blenkernel/intern/tracking.c (+86, -30) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+1, -0) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+33, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+18, -5) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -0) (Diff)
/source/blender/editors/include/UI_resources.h (+2, -1) (Diff)
/source/blender/editors/interface/resources.c (+10, -1) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+95, -41) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+79, -59) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+4, -3) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -0) (Diff)
/source/blender/editors/space_clip/tracking_ops.c (+148, -110) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+173, -12) (Diff)
/source/blender/editors/transform/transform_conversions.c (+29, -23) (Diff)
/source/blender/editors/transform/transform_generics.c (+13, -13) (Diff)
/source/blender/makesdna/DNA_movieclip_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_space_types.h (+3, -5) (Diff)
/source/blender/makesdna/DNA_tracking_types.h (+38, -5) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+11, -1) (Diff)
/source/blender/makesrna/intern/rna_movieclip.c (+16, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+31, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+80, -35) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+21, -4) (Diff)
/source/blender/blenkernel/BKE_movieclip.h (+3, -3) (Diff)
/source/blender/blenkernel/BKE_tracking.h (+17, -9) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+20, -12) (Diff)
/source/blender/blenkernel/intern/tracking.c (+86, -30) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+1, -0) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+33, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+18, -5) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -0) (Diff)
/source/blender/editors/include/UI_resources.h (+2, -1) (Diff)
/source/blender/editors/interface/resources.c (+10, -1) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+95, -41) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+79, -59) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+4, -3) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -0) (Diff)
/source/blender/editors/space_clip/tracking_ops.c (+148, -110) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+173, -12) (Diff)
/source/blender/editors/transform/transform_conversions.c (+29, -23) (Diff)
/source/blender/editors/transform/transform_generics.c (+13, -13) (Diff)
/source/blender/makesdna/DNA_movieclip_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_space_types.h (+3, -5) (Diff)
/source/blender/makesdna/DNA_tracking_types.h (+38, -5) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+11, -1) (Diff)
/source/blender/makesrna/intern/rna_movieclip.c (+16, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+31, -0) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+80, -35) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+6, -0) (Diff)