diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/editors/transform/transform_mode.c | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/editors/transform/transform_mode.c')
-rw-r--r-- | source/blender/editors/transform/transform_mode.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/source/blender/editors/transform/transform_mode.c b/source/blender/editors/transform/transform_mode.c index 5e0abbc1a08..d2e7f9f83df 100644 --- a/source/blender/editors/transform/transform_mode.c +++ b/source/blender/editors/transform/transform_mode.c @@ -78,7 +78,6 @@ bool transdata_check_local_center(const TransInfo *t, short around) (t->options & (CTX_MOVIECLIP | CTX_MASK | CTX_PAINT_CURVE | CTX_SEQUENCER_IMAGE)))); } -/* Informs if the mode can be switched during modal. */ bool transform_mode_is_changeable(const int mode) { return ELEM(mode, @@ -520,10 +519,12 @@ void constraintSizeLim(const TransInfo *t, TransData *td) } } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Transform (Rotation Utils) * \{ */ -/* Used by Transform Rotation and Transform Normal Rotation */ + void headerRotation(TransInfo *t, char *str, const int str_size, float final) { size_t ofs = 0; @@ -551,12 +552,6 @@ void headerRotation(TransInfo *t, char *str, const int str_size, float final) } } -/** - * Applies values of rotation to `td->loc` and `td->ext->quat` - * based on a rotation matrix (mat) and a pivot (center). - * - * Protected axis and other transform settings are taken into account. - */ void ElementRotation_ex(const TransInfo *t, const TransDataContainer *tc, TransData *td, @@ -828,11 +823,13 @@ void ElementRotation(const TransInfo *t, ElementRotation_ex(t, tc, td, mat, center); } + /** \} */ /* -------------------------------------------------------------------- */ /** \name Transform (Resize Utils) * \{ */ + void headerResize(TransInfo *t, const float vec[3], char *str, const int str_size) { char tvec[NUM_STR_REP_LEN * 3]; @@ -1232,15 +1229,12 @@ void transform_mode_init(TransInfo *t, wmOperator *op, const int mode) * BLI_assert(t->mode == mode); */ } -/** - * When in modal and not set, initializes a default orientation for the mode. - */ void transform_mode_default_modal_orientation_set(TransInfo *t, int type) { /* Currently only these types are supported. */ BLI_assert(ELEM(type, V3D_ORIENT_GLOBAL, V3D_ORIENT_VIEW)); - if (t->is_orient_set) { + if (t->is_orient_default_overwrite) { return; } @@ -1276,4 +1270,5 @@ void transform_mode_default_modal_orientation_set(TransInfo *t, int type) transform_orientations_current_set(t, O_DEFAULT); } } + /** \} */ |