diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 19:35:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 19:35:39 +0300 |
| commit | a3e74acd9ee2879898389cb9d33950f44494932e (patch) | |
| tree | 7d821b4c8b2076542e12b0afef1c7950570bb291 /source/blender/editors/include/ED_object.h | |
| parent | c769b1a5533bb0fcf04452cde4d81dd77f7ae03b (diff) | |
| parent | 046904e3fc6d5a9b10215d97ffc71f08bce37a41 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 1d35401ebd2..0775c2b953b 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -162,6 +162,7 @@ void ED_object_sculptmode_exit_ex( void ED_object_sculptmode_exit(struct bContext *C); void ED_object_location_from_view(struct bContext *C, float loc[3]); +void ED_object_rotation_from_quat(float rot[3], const float quat[4], const char align_axis); void ED_object_rotation_from_view(struct bContext *C, float rot[3], const char align_axis); void ED_object_base_init_transform(struct bContext *C, struct Base *base, const float loc[3], const float rot[3]); float ED_object_new_primitive_matrix( |