diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 04:27:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 04:27:18 +0300 |
commit | 5940ea11ce89ce16db1cfa956b80efcfddc2e2c8 (patch) | |
tree | cf220b075727cfc222a7b8c714caef7e6e4f7b02 /source/blender/editors/transform/transform.h | |
parent | d49cbe19364c6bb03a2d531abc5abe95dfaa6c7d (diff) | |
parent | 7be3378d1620b1a8029b78425e3a64e2fcd6b210 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform/transform.h')
-rw-r--r-- | source/blender/editors/transform/transform.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index dfcd3e4cfd6..20512a18ae3 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -875,6 +875,8 @@ bool applyTransformOrientation(const struct TransformOrientation *ts, float r_ma #define ORIENTATION_VERT 2 #define ORIENTATION_EDGE 3 #define ORIENTATION_FACE 4 +#define ORIENTATION_USE_PLANE(ty) \ + ELEM(ty, ORIENTATION_NORMAL, ORIENTATION_EDGE, ORIENTATION_FACE) int getTransformOrientation_ex(const struct bContext *C, float normal[3], float plane[3], const short around); int getTransformOrientation(const struct bContext *C, float normal[3], float plane[3]); |