Revision: 42398
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42398
Author: keir
Date: 2011-12-04 13:58:40 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Turn grayscale preview on if any channel toggles are active for motion tracking.
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
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
2011-12-04 13:46:25 UTC (rev 42397)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
2011-12-04 13:58:40 UTC (rev 42398)
@@ -361,7 +361,7 @@
row.separator()
sub = row.row()
- sub.prop(act_track, "preview_grayscale", text="B/W", toggle=True)
+ sub.prop(act_track, "use_grayscale_preview", text="B/W", toggle=True)
layout.separator()
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2011-12-04 13:46:25 UTC (rev 42397)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2011-12-04 13:58:40 UTC (rev 42398)
@@ -949,7 +949,10 @@
origin[1]= y1-margin;
}
- if (track->flag & TRACK_PREVIEW_GRAYSCALE) {
+ if ((track->flag & TRACK_PREVIEW_GRAYSCALE) ||
+ (track->flag & TRACK_DISABLE_RED) ||
+ (track->flag & TRACK_DISABLE_GREEN) ||
+ (track->flag & TRACK_DISABLE_BLUE) ) {
disable_imbuf_channels(tmpibuf, track, 1 /* grayscale */);
}
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
2011-12-04 13:46:25 UTC (rev 42397)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
2011-12-04 13:58:40 UTC (rev 42398)
@@ -674,7 +674,7 @@
RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
/* preview_grayscale */
- prop= RNA_def_property(srna, "preview_grayscale", PROP_BOOLEAN,
PROP_NONE);
+ prop= RNA_def_property(srna, "use_grayscale_preview", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag",
TRACK_PREVIEW_GRAYSCALE);
RNA_def_property_ui_text(prop, "Grayscale", "Display what the tracking
algorithm sees in the preview");
RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
