diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
commit | b9898ebde44d6584ea37a05aaeca8760d31ccc7b (patch) | |
tree | e6dfc796cc82b4b8b8c248c4ff29d2e2047ff84c /source/blender/editors/transform/transform.h | |
parent | b17380971a144896b34b7863a82bbda3ff68a39f (diff) | |
parent | 553b581f25c1782c4231816965cd3f6ce58a449a (diff) |
Merge branch 'master' into filebrowser_redesign
Diffstat (limited to 'source/blender/editors/transform/transform.h')
-rw-r--r-- | source/blender/editors/transform/transform.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index b0f720bfdf7..b023199fa1b 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -102,7 +102,7 @@ typedef struct TransSnap { * Get the transform distance between two points (used by Closest snap) * * \note Return value can be anything, - * where the smallest absolute value defines whats closest. + * where the smallest absolute value defines what's closest. */ float (*distance)(struct TransInfo *t, const float p1[3], const float p2[3]); @@ -662,10 +662,16 @@ typedef struct TransInfo { short prop_mode; + /** Value taken as input, either through mouse coordinates or entered as a parameter. */ float values[4]; + /** Offset applied ontop of modal input. */ float values_modal_offset[4]; - float auto_values[4]; + + /** Final value of the transformation (displayed in the redo panel). + * If the operator is executed directly (not modal), this value is usually the + * value of the input parameter, except when a constrain is entered. */ + float values_final[4]; /* Axis members for modes that use an axis separate from the orientation (rotate & shear). */ @@ -764,7 +770,9 @@ enum { /** Don't use mirror even if the data-block option is set. */ T_NO_MIRROR = 1 << 19, - T_AUTOVALUES = 1 << 20, + /** To indicate that the value set in the `value` parameter is the final + * value of the transformation, modified only by the constrain. */ + T_INPUT_IS_VALUES_FINAL = 1 << 20, /** To specify if we save back settings at the end. */ T_MODAL = 1 << 21, |