[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47793] branches/soc-2011-tomato: Merging r47783 through r47792 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 12 19:14:13 CEST 2012
Revision: 47793
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47793
Author: nazgul
Date: 2012-06-12 17:14:12 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Merging r47783 through r47792 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47783
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47792
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47782
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47792
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-06-12 17:11:16 UTC (rev 47792)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-06-12 17:14:12 UTC (rev 47793)
@@ -62,13 +62,17 @@
r = active_object.reconstruction
if r.is_valid and sc.view == 'CLIP':
- layout.label(text="Average solve error: %.4f" %
+ layout.label(text="Solve error: %.4f" %
(r.average_error))
elif sc.view == 'GRAPH':
layout.prop(sc, "view", text="", expand=True)
row = layout.row(align=True)
+ row.prop(sc, "show_graph_only_selected", text="")
+ row.prop(sc, "show_graph_hidden", text="")
+ row = layout.row(align=True)
+
if sc.show_filters:
row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_DOWN',
text="Filters")
@@ -82,11 +86,16 @@
row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_RIGHT',
text="Filters")
elif sc.view == 'DOPESHEET':
+ dopesheet = tracking.dopesheet
layout.prop(sc, "view", text="", expand=True)
- layout.label(text="Sort by:")
- layout.prop(sc, "dopesheet_sort_method", text="")
- layout.prop(sc, "invert_dopesheet_sort", text="Invert")
+ row = layout.row(align=True)
+ row.prop(dopesheet, "show_only_selected", text="")
+ row.prop(dopesheet, "show_hidden", text="")
+
+ row = layout.row(align=True)
+ row.prop(dopesheet, "sort_method", text="")
+ row.prop(dopesheet, "use_invert_sort", text="Invert", toggle=True)
else:
layout.prop(sc, "view", text="", expand=True)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h 2012-06-12 17:11:16 UTC (rev 47792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h 2012-06-12 17:14:12 UTC (rev 47793)
@@ -171,7 +171,7 @@
/* Dopesheet */
void BKE_tracking_dopesheet_tag_update(struct MovieTracking *tracking);
-void BKE_tracking_dopesheet_update(struct MovieTracking *tracking, int sort_method, int inverse);
+void BKE_tracking_dopesheet_update(struct MovieTracking *tracking);
#define TRACK_SELECTED(track) ((track)->flag & SELECT || (track)->pat_flag & SELECT || (track)->search_flag & SELECT)
@@ -202,10 +202,4 @@
#define TRACK_AREA_ALL (TRACK_AREA_POINT | TRACK_AREA_PAT | TRACK_AREA_SEARCH)
-#define TRACK_SORT_NONE -1
-#define TRACK_SORT_NAME 0
-#define TRACK_SORT_LONGEST 1
-#define TRACK_SORT_TOTAL 2
-#define TRACK_SORT_AVERAGE_ERROR 3
-
#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c 2012-06-12 17:11:16 UTC (rev 47792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c 2012-06-12 17:14:12 UTC (rev 47793)
@@ -2159,7 +2159,7 @@
printf("do Action Constraint %s - Ob %s Pchan %s\n", con->name, cob->ob->id.name + 2, (cob->pchan) ? cob->pchan->name : NULL);
/* Get the appropriate information from the action */
- if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & BONE_USE_OBJECT_ACTION)) {
+ if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & ACTCON_BONE_USE_OBJECT_ACTION)) {
Object workob;
/* evaluate using workob */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2012-06-12 17:11:16 UTC (rev 47792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2012-06-12 17:14:12 UTC (rev 47793)
@@ -3545,40 +3545,34 @@
{
MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
- if (dopesheet->sort_method == sort_method && dopesheet->sort_inverse == inverse)
- return;
-
if (inverse) {
- if (sort_method == TRACK_SORT_NAME) {
+ if (sort_method == TRACKING_DOPE_SORT_NAME) {
BLI_sortlist(&dopesheet->channels, channels_alpha_inverse_sort);
}
- else if (sort_method == TRACK_SORT_LONGEST) {
+ else if (sort_method == TRACKING_DOPE_SORT_LONGEST) {
BLI_sortlist(&dopesheet->channels, channels_longest_segment_inverse_sort);
}
- else if (sort_method == TRACK_SORT_TOTAL) {
+ else if (sort_method == TRACKING_DOPE_SORT_TOTAL) {
BLI_sortlist(&dopesheet->channels, channels_total_track_inverse_sort);
}
- else if (sort_method == TRACK_SORT_AVERAGE_ERROR) {
+ else if (sort_method == TRACKING_DOPE_SORT_AVERAGE_ERROR) {
BLI_sortlist(&dopesheet->channels, channels_average_error_inverse_sort);
}
}
else {
- if (sort_method == TRACK_SORT_NAME) {
+ if (sort_method == TRACKING_DOPE_SORT_NAME) {
BLI_sortlist(&dopesheet->channels, channels_alpha_sort);
}
- else if (sort_method == TRACK_SORT_LONGEST) {
+ else if (sort_method == TRACKING_DOPE_SORT_LONGEST) {
BLI_sortlist(&dopesheet->channels, channels_longest_segment_sort);
}
- else if (sort_method == TRACK_SORT_TOTAL) {
+ else if (sort_method == TRACKING_DOPE_SORT_TOTAL) {
BLI_sortlist(&dopesheet->channels, channels_total_track_sort);
}
- else if (sort_method == TRACK_SORT_AVERAGE_ERROR) {
+ else if (sort_method == TRACKING_DOPE_SORT_AVERAGE_ERROR) {
BLI_sortlist(&dopesheet->channels, channels_average_error_sort);
}
}
-
- dopesheet->sort_method = sort_method;
- dopesheet->sort_inverse = inverse;
}
void BKE_tracking_dopesheet_tag_update(MovieTracking *tracking)
@@ -3588,36 +3582,51 @@
dopesheet->ok = FALSE;
}
-void BKE_tracking_dopesheet_update(MovieTracking *tracking, int sort_method, int inverse)
+void BKE_tracking_dopesheet_update(MovieTracking *tracking)
{
MovieTrackingObject *object = BKE_tracking_active_object(tracking);
MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
MovieTrackingTrack *track;
+ MovieTrackingReconstruction *reconstruction;
ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
- if (dopesheet->ok) {
- tracking_dopesheet_sort(tracking, sort_method, inverse);
+ short sort_method = dopesheet->sort_method;
+ short inverse = dopesheet->flag & TRACKING_DOPE_SORT_INVERSE;
+ short sel_only = dopesheet->flag & TRACKING_DOPE_SELECTED_ONLY;
+ short show_hidden = dopesheet->flag & TRACKING_DOPE_SHOW_HIDDEN;
+
+ if (dopesheet->ok)
return;
- }
tracking_dopesheet_free(dopesheet);
+ reconstruction = BKE_tracking_object_reconstruction(tracking, object);
+
for (track = tracksbase->first; track; track = track->next) {
- if (TRACK_SELECTED(track) && (track->flag & TRACK_HIDDEN) == 0) {
- MovieTrackingDopesheetChannel *channel;
+ MovieTrackingDopesheetChannel *channel;
- channel = MEM_callocN(sizeof(MovieTrackingDopesheetChannel), "tracking dopesheet channel");
- channel->track = track;
+ if (!show_hidden && (track->flag & TRACK_HIDDEN) != 0)
+ continue;
- channels_segments_calc(channel);
+ if (sel_only && !TRACK_SELECTED(track))
+ continue;
- BLI_addtail(&dopesheet->channels, channel);
- dopesheet->tot_channel++;
+ channel = MEM_callocN(sizeof(MovieTrackingDopesheetChannel), "tracking dopesheet channel");
+ channel->track = track;
+
+ if (reconstruction->flag & TRACKING_RECONSTRUCTED) {
+ BLI_snprintf(channel->name, sizeof(channel->name), "%s (%.4f)", track->name, track->error);
}
+ else {
+ BLI_strncpy(channel->name, track->name, sizeof(channel->name));
+ }
+
+ channels_segments_calc(channel);
+
+ BLI_addtail(&dopesheet->channels, channel);
+ dopesheet->tot_channel++;
}
- dopesheet->sort_method = TRACK_SORT_NONE;
-
tracking_dopesheet_sort(tracking, sort_method, inverse);
dopesheet->ok = TRUE;
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47782
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list