diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-16 06:38:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-16 06:50:00 +0300 |
commit | c9c23a3e44c0648d37396bbb19236e881d33e2cc (patch) | |
tree | 12b7b7f2dc205d1ad373f78396841d5290abcf31 /source/blender/editors | |
parent | f2144cf298aab7fd173025e490fa9e98b7661a88 (diff) |
RNA: add 3D cursor matrix attribute
Avoids having to check rotation modes to get the orientation.
Diffstat (limited to 'source/blender/editors')
5 files changed, 4 insertions, 20 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 3503d38ad92..8974f3d6374 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -108,8 +108,6 @@ enum eV3DCursorOrient { void ED_view3d_background_color_get(const struct Scene *scene, const struct View3D *v3d, float r_color[3]); -void ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, float mat[3][3]); -void ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, float mat[4][4]); void ED_view3d_cursor3d_position(struct bContext *C, const int mval[2], const bool use_depth, diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.c b/source/blender/editors/mesh/editmesh_add_gizmo.c index 839ee186016..f6729fb56e1 100644 --- a/source/blender/editors/mesh/editmesh_add_gizmo.c +++ b/source/blender/editors/mesh/editmesh_add_gizmo.c @@ -29,6 +29,7 @@ #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_scene.h" #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" @@ -75,7 +76,7 @@ static void calc_initial_placement_point_from_view(bContext *C, float cursor_matrix[4][4]; float orient_matrix[3][3]; - ED_view3d_cursor3d_calc_mat4(scene, cursor_matrix); + BKE_scene_cursor_to_mat4(&scene->cursor, cursor_matrix); float dots[3] = { dot_v3v3(rv3d->viewinv[2], cursor_matrix[0]), diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 91313657f59..bb8c1a40a05 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -86,21 +86,6 @@ void ED_view3d_background_color_get(const Scene *scene, const View3D *v3d, float UI_GetThemeColor3fv(TH_BACK, r_color); } -void ED_view3d_cursor3d_calc_mat3(const Scene *scene, float mat[3][3]) -{ - const View3DCursor *cursor = &scene->cursor; - BKE_scene_cursor_rot_to_mat3(cursor, mat); -} - -void ED_view3d_cursor3d_calc_mat4(const Scene *scene, float mat[4][4]) -{ - const View3DCursor *cursor = &scene->cursor; - float mat3[3][3]; - BKE_scene_cursor_rot_to_mat3(cursor, mat3); - copy_m4_m3(mat, mat3); - copy_v3_v3(mat[3], cursor->location); -} - Camera *ED_view3d_camera_data_get(View3D *v3d, RegionView3D *rv3d) { /* establish the camera object, diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 35fda39e8dc..e43379dc358 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -703,7 +703,7 @@ void ED_transform_calc_orientation_from_type_ex(const bContext *C, break; } case V3D_ORIENT_CURSOR: { - ED_view3d_cursor3d_calc_mat3(scene, r_mat); + BKE_scene_cursor_rot_to_mat3(&scene->cursor, r_mat); ok = true; break; } diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index e16579aba64..70bb2bf98a6 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -485,7 +485,7 @@ void initTransformOrientation(bContext *C, TransInfo *t) break; case V3D_ORIENT_CURSOR: { BLI_strncpy(t->spacename, IFACE_("cursor"), sizeof(t->spacename)); - ED_view3d_cursor3d_calc_mat3(t->scene, t->spacemtx); + BKE_scene_cursor_rot_to_mat3(&t->scene->cursor, t->spacemtx); break; } case V3D_ORIENT_CUSTOM_MATRIX: |