archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

More UI messages fixes and cleanup.

Browse Source
This commit is contained in:
Bastien Montagne
2016-08-17 12:53:03 +02:00
parent acbef397ac
commit 186ee0934f
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/io/io_alembic.c
View File

@@ -267,7 +267,7 @@ void WM_OT_alembic_export(wmOperatorType *ot)
RNA_def_boolean(ot->srna, "normals", 1, "Normals", "Export normals");
RNA_def_boolean(ot->srna, "vcolors", 0, "Vertex colors", "Export vertex colors");
RNA_def_boolean(ot->srna, "vcolors", 0, "Vertex Colors", "Export vertex colors");
RNA_def_boolean(ot->srna, "face_sets", 0, "Face Sets", "Export per face shading group assignments");

28
source/blender/makesrna/intern/rna_tracking.c
View File

@@ -1674,7 +1674,7 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem filter_items[] = {
{TRACKING_FILTER_NEAREST, "NEAREST", 0, "Nearest", "No interpolation; use nearest neighbor pixel"},
{TRACKING_FILTER_NEAREST, "NEAREST", 0, "Nearest", "No interpolation, use nearest neighbor pixel"},
{TRACKING_FILTER_BILINEAR, "BILINEAR", 0, "Bilinear", "Simple interpolation between adjacent pixels"},
{TRACKING_FILTER_BICUBIC, "BICUBIC", 0, "Bicubic", "High quality pixel interpolation"},
{0, NULL, 0, NULL, NULL}
@@ -1711,7 +1711,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
"rna_iterator_listbase_end", "rna_iterator_listbase_get",
NULL, NULL, NULL, NULL);
RNA_def_property_struct_type(prop, "MovieTrackingTrack");
RNA_def_property_ui_text(prop, "Translation Tracks", "Collection of tracks used for 2D stabilization (translation)");
RNA_def_property_ui_text(prop, "Translation Tracks",
"Collection of tracks used for 2D stabilization (translation)");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
/* active track index */
@@ -1721,7 +1722,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
RNA_def_property_int_funcs(prop, "rna_tracking_stabTracks_active_index_get",
"rna_tracking_stabTracks_active_index_set",
"rna_tracking_stabTracks_active_index_range");
RNA_def_property_ui_text(prop, "Active Track Index", "Index of active track in translation stabilization tracks list");
RNA_def_property_ui_text(prop, "Active Track Index",
"Index of active track in translation stabilization tracks list");
/* tracks used for rotation stabilization */
prop = RNA_def_property(srna, "rotation_tracks", PROP_COLLECTION, PROP_NONE);
@@ -1739,14 +1741,17 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
RNA_def_property_int_funcs(prop, "rna_tracking_stabRotTracks_active_index_get",
"rna_tracking_stabRotTracks_active_index_set",
"rna_tracking_stabRotTracks_active_index_range");
RNA_def_property_ui_text(prop, "Active Rotation Track Index", "Index of active track in rotation stabilization tracks list");
RNA_def_property_ui_text(prop, "Active Rotation Track Index",
"Index of active track in rotation stabilization tracks list");
/* anchor frame */
prop = RNA_def_property(srna, "anchor_frame", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "anchor_frame");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, MINFRAME, MAXFRAME);
RNA_def_property_ui_text(prop, "Anchor Frame", "Reference point to anchor stabilization (other frames will be adjusted relative to this frame's position)");
RNA_def_property_ui_text(prop, "Anchor Frame",
"Reference point to anchor stabilization "
"(other frames will be adjusted relative to this frame's position)");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
/* target position */
@@ -1754,7 +1759,9 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
RNA_def_property_array(prop, 2);
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3); /* increment in steps of 0.01 and show 3 digit after point */
RNA_def_property_float_sdna(prop, NULL, "target_pos");
RNA_def_property_ui_text(prop, "Expected Position", "Known relative offset of original shot, will be subtracted; e.g. for panning shot, can be animated");
RNA_def_property_ui_text(prop, "Expected Position",
"Known relative offset of original shot, will be subtracted "
"(e.g. for panning shot, can be animated)");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
/* target rotation */
@@ -1762,7 +1769,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "target_rot");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3);
RNA_def_property_ui_text(prop, "Expected Rotation", "Rotation present on original shot, will be compensated; e.g. for deliberate tilting");
RNA_def_property_ui_text(prop, "Expected Rotation",
"Rotation present on original shot, will be compensated (e.g. for deliberate tilting)");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
/* target scale */
@@ -1770,7 +1778,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "scale");
RNA_def_property_range(prop, FLT_EPSILON, 100.0f);
RNA_def_property_ui_range(prop, 0.1f, 10.0f, 1, 3); /* increment in steps of 0.01. Show 3 digit after point */
RNA_def_property_ui_text(prop, "Expected Zoom", "Explicitly scale resulting frame to compensate zoom of original shot");
RNA_def_property_ui_text(prop, "Expected Zoom",
"Explicitly scale resulting frame to compensate zoom of original shot");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
/* autoscale */
@@ -1813,7 +1822,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "filter");
RNA_def_property_enum_items(prop, filter_items);
RNA_def_property_ui_text(prop, "Interpolate", "Interpolation to use for sub-pixel shifts and rotations due to stabilization");
RNA_def_property_ui_text(prop, "Interpolate",
"Interpolation to use for sub-pixel shifts and rotations due to stabilization");
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
/* UI display : show participating tracks */