[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38617] branches/soc-2011-salad: Merging r38573 through r38616 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Fri Jul 22 19:02:02 CEST 2011
Revision: 38617
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38617
Author: nazgul
Date: 2011-07-22 17:02:02 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
Merging r38573 through r38616 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38573
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38616
Modified Paths:
--------------
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/editors/transform/transform.h
branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38572
/trunk/blender:36834-38615
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38616
/trunk/blender:36834-38615
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-07-22 17:02:02 UTC (rev 38617)
@@ -161,6 +161,7 @@
op = col.operator("clip.clear_track_path", text="Clear Track Path")
op.action = 'ALL'
+ layout.operator("clip.join_tracks")
layout.operator("clip.detect_features")
layout.operator("clip.apply_follow_track")
@@ -217,8 +218,10 @@
row = layout.row(align=True)
label = bpy.types.CLIP_MT_track_color_presets.bl_label
row.menu('CLIP_MT_track_color_presets', text=label)
+ row.menu('CLIP_MT_track_color_specials', text="", icon="DOWNARROW_HLT")
row.operator("clip.track_color_preset_add", text="", icon="ZOOMIN")
- op = row.operator("clip.track_color_preset_add", text="", icon="ZOOMOUT")
+ op = row.operator("clip.track_color_preset_add", \
+ text="", icon="ZOOMOUT")
op.remove_active = True
row = layout.row()
@@ -234,7 +237,6 @@
row.prop(act_track, "use_blue_channel", text="Blue")
-
class CLIP_PT_track_settings(bpy.types.Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
@@ -497,12 +499,40 @@
sc = context.space_data
+ layout.menu("CLIP_MT_select_grouped")
layout.operator("clip.select_border")
layout.operator("clip.select_circle")
layout.operator("clip.select_all", text="Select/Deselect all")
layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
+class CLIP_MT_select_grouped(bpy.types.Menu):
+ bl_label = "Select Grouped"
+
+ def draw(self, context):
+ layout = self.layout
+
+ sc = context.space_data
+
+ op = layout.operator("clip.select_grouped", text="Select Keyframed")
+ op.group = 'KEYFRAMED'
+
+ op = layout.operator("clip.select_grouped", text="Select Estimated")
+ op.group = 'ESTIMATED'
+
+ op = layout.operator("clip.select_grouped", text="Select Tracked")
+ op.group = 'TRACKED'
+
+ op = layout.operator("clip.select_grouped", text="Select Locked")
+ op.group = 'LOCKED'
+
+ op = layout.operator("clip.select_grouped", text="Select Disabled")
+ op.group = 'DISABLED'
+
+ op = layout.operator("clip.select_grouped", text="Select by Color")
+ op.group = 'COLOR'
+
+
class CLIP_MT_tracking_specials(bpy.types.Menu):
bl_label = "Specials"
@@ -548,5 +578,14 @@
draw = bpy.types.Menu.draw_preset
+class CLIP_MT_track_color_specials(bpy.types.Menu):
+ bl_label = "Track Color Specials"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator('clip.track_copy_color', icon='COPY_ID')
+
+
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h 2011-07-22 17:02:02 UTC (rev 38617)
@@ -56,6 +56,8 @@
void BKE_tracking_free_track(struct MovieTrackingTrack *track);
struct MovieTrackingTrack *BKE_tracking_copy_track(struct MovieTrackingTrack *track);
void BKE_tracking_clear_path(struct MovieTrackingTrack *track, int ref_frame, int action);
+int BKE_tracking_test_join_tracks(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
+void BKE_tracking_join_tracks(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
void BKE_tracking_free(struct MovieTracking *tracking);
struct ImBuf *BKE_tracking_acquire_pattern_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c 2011-07-22 17:02:02 UTC (rev 38617)
@@ -375,6 +375,51 @@
}
}
+int BKE_tracking_test_join_tracks(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
+{
+ int i, a= 0, b= 0, tot= dst_track->markersnr+src_track->markersnr;
+
+ for(i= 0; i<tot; i++) {
+ if(b>=dst_track->markersnr || a>=src_track->markersnr)
+ break;
+
+ if(src_track->markers[a].framenr<dst_track->markers[b].framenr)
+ a++;
+ else if(src_track->markers[a].framenr>dst_track->markers[b].framenr)
+ b++;
+ else
+ return 0;
+ }
+
+ return 1;
+}
+
+void BKE_tracking_join_tracks(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
+{
+ int i, a= 0, b= 0, tot= dst_track->markersnr+src_track->markersnr;
+ MovieTrackingMarker *markers;
+
+ markers= MEM_callocN(tot*sizeof(MovieTrackingMarker), "tracking joined tracks");
+
+ for(i= 0; i<tot; i++) {
+ if(b>=dst_track->markersnr) {
+ markers[i]= src_track->markers[a++];
+ }
+ else if(a>=src_track->markersnr) {
+ markers[i]= dst_track->markers[b++];
+ }
+ else if(src_track->markers[a].framenr<dst_track->markers[b].framenr)
+ markers[i]= src_track->markers[a++];
+ else
+ markers[i]= dst_track->markers[b++];
+ }
+
+ MEM_freeN(dst_track->markers);
+
+ dst_track->markers= markers;
+ dst_track->markersnr= tot;
+}
+
void BKE_tracking_free(MovieTracking *tracking)
{
MovieTrackingTrack *track;
Modified: branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c 2011-07-22 17:02:02 UTC (rev 38617)
@@ -490,6 +490,7 @@
}
if(sc->flag&SC_SHOW_MARKER_PATTERN) {
+ float tdx2= 0, tdy2= 0;
/* use smaller slider for pattern area */
dx= 10.0f/width/sc->zoom;
dy= 10.0f/height/sc->zoom;
@@ -499,15 +500,33 @@
else glColor3fv(col);
}
+ tdx=MIN2(dx, (track->pat_max[0]-track->pat_min[0])/5);
+ tdy=MIN2(dy, (track->pat_max[1]-track->pat_min[1])/5);
+
+ if(outline) {
+ tdx+= 1.0f/sc->zoom/width;
+ tdy+= 1.0f/sc->zoom/height;
+
+ tdx2+= 1.0f/sc->zoom/width;
+ tdy2+= 1.0f/sc->zoom/height;
+ }
+
+ x= track->pat_min[0];
+ y= track->pat_max[1];
+
+ glBegin(GL_QUADS);
+ glVertex3f(x+tdx2, y-tdy2, 0);
+ glVertex3f(x-tdx, y-tdy2, 0);
+ glVertex3f(x-tdx, y+tdy, 0);
+ glVertex3f(x+tdx2, y+tdy, 0);
+ glEnd();
+
x= track->pat_max[0];
y= track->pat_min[1];
- tdx=MIN2(dx, track->pat_max[0]-track->pat_min[0]);
- tdy=MIN2(dy, track->pat_max[1]-track->pat_min[1]);
-
if(outline) {
- tdx+= 2.0f/sc->zoom/width;
- tdy+= 2.0f/sc->zoom/height;
+ tdx+= 1.0f/sc->zoom/width;
+ tdy+= 1.0f/sc->zoom/height;
}
glBegin(GL_TRIANGLES);
Modified: branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h 2011-07-22 17:02:02 UTC (rev 38617)
@@ -62,6 +62,7 @@
void CLIP_OT_select_all(struct wmOperatorType *ot);
void CLIP_OT_select_border(struct wmOperatorType *ot);
void CLIP_OT_select_circle(struct wmOperatorType *ot);
+void CLIP_OT_select_grouped(struct wmOperatorType *ot);
void CLIP_OT_add_marker(struct wmOperatorType *ot);
void CLIP_OT_delete_track(struct wmOperatorType *ot);
@@ -72,6 +73,7 @@
void CLIP_OT_clear_reconstruction(struct wmOperatorType *ot);
void CLIP_OT_clear_track_path(struct wmOperatorType *ot);
+void CLIP_OT_join_tracks(struct wmOperatorType *ot);
void CLIP_OT_disable_markers(struct wmOperatorType *ot);
void CLIP_OT_hide_tracks(struct wmOperatorType *ot);
@@ -87,6 +89,9 @@
void CLIP_OT_slide_marker(struct wmOperatorType *ot);
+void CLIP_OT_frame_jump(struct wmOperatorType *ot);
+void CLIP_OT_track_copy_color(struct wmOperatorType *ot);
+
void CLIP_OT_detect_features(struct wmOperatorType *ot);
/* clip_draw.c */
Modified: branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c 2011-07-22 17:00:09 UTC (rev 38616)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c 2011-07-22 17:02:02 UTC (rev 38617)
@@ -230,6 +230,7 @@
WM_operatortype_append(CLIP_OT_select_all);
WM_operatortype_append(CLIP_OT_select_border);
WM_operatortype_append(CLIP_OT_select_circle);
+ WM_operatortype_append(CLIP_OT_select_grouped);
WM_operatortype_append(CLIP_OT_add_marker);
WM_operatortype_append(CLIP_OT_delete_track);
@@ -252,9 +253,13 @@
WM_operatortype_append(CLIP_OT_set_center_principal);
WM_operatortype_append(CLIP_OT_clear_track_path);
+ WM_operatortype_append(CLIP_OT_join_tracks);
+ WM_operatortype_append(CLIP_OT_track_copy_color);
WM_operatortype_append(CLIP_OT_slide_marker);
+ WM_operatortype_append(CLIP_OT_frame_jump);
+
WM_operatortype_append(CLIP_OT_detect_features);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list