diff options
| author | Ichthyostega <prg@ichthyostega.de> | 2016-08-19 15:33:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-23 12:53:35 +0300 |
| commit | fd65a649303cee33266c6fffffab5f86df47545e (patch) | |
| tree | c8b512ab28b66f03399ac77bb1663fb9353f93c3 | |
| parent | 3dbe1744402c2790d7854f09cf977bb275436479 (diff) | |
2D stabilization: change presentation of target_scale in UI
Alongside with this change, we fix disabling of Autoscale,
because this feature works even when rotation/scale is disabled.
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 8d581e84e25..5cc135392c1 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -960,7 +960,6 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): icon='DOWNARROW_HLT') row = layout.row() - row.active = stab.use_stabilize_rotation row.prop(stab, "use_autoscale") sub = row.row() sub.active = stab.use_autoscale @@ -971,10 +970,9 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): # Hrm, how to make it more obvious label? row.prop(stab, "target_position", text="") col.prop(stab, "target_rotation") - if stab.use_autoscale: - col.label(text="Auto Scale Factor: %5.3f" % (1.0 / stab.target_zoom)) - else: - col.prop(stab, "target_zoom") + row = col.row(align=True) + row.prop(stab, "target_scale") + row.active = not stab.use_autoscale col = layout.column(align=True) col.prop(stab, "influence_location") diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 2d068bbab26..6e41a7ad09a 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -1774,7 +1774,7 @@ static void rna_def_trackingStabilization(BlenderRNA *brna) RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); /* target scale */ - prop = RNA_def_property(srna, "target_zoom", PROP_FLOAT, PROP_FACTOR); + prop = RNA_def_property(srna, "target_scale", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "scale"); RNA_def_property_range(prop, FLT_EPSILON, FLT_MAX); RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.001f, 3); /* increment in steps of 0.001. Show 3 digit after point */ |