diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-09 08:27:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-09 11:07:55 +0300 |
commit | d186ab6560414d9a817a84cc31a0a73f340c571c (patch) | |
tree | cd65bac30e8302ef0d18d747e996ced44e6f19ed /source/blender/editors/manipulator_library/manipulator_library_intern.h | |
parent | f0d4420cc0624da5238a317cfa3d08204c35a3dc (diff) |
Manipulator: grab3d - support for 2d views
Also internal changes so arrow3d matches grab3d's behavior.
Needed to add WM_MANIPULATOR_DRAW_OFFSET_SCALE flag so
we can optionally apply offset in worldspace or screen scaled values.
Diffstat (limited to 'source/blender/editors/manipulator_library/manipulator_library_intern.h')
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_library_intern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_library_intern.h b/source/blender/editors/manipulator_library/manipulator_library_intern.h index a22afda8730..3a504ebe1d2 100644 --- a/source/blender/editors/manipulator_library/manipulator_library_intern.h +++ b/source/blender/editors/manipulator_library/manipulator_library_intern.h @@ -50,10 +50,10 @@ typedef struct ManipulatorCommonData { typedef struct ManipulatorInteraction { float init_value; /* initial property value */ - float init_matrix[4][4]; + float init_matrix_basis[4][4]; float init_mval[2]; float init_offset; - float init_scale; + float init_scale_final; /* offset of last handling step */ float prev_offset; |