nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +13 -9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 232e02282e - Show all commits

12
source/blender/editors/transform/transform.h
View File

@ -211,6 +211,12 @@ typedef enum {
HLP_TRACKBALL = 6, HLP_TRACKBALL = 6,
} eTHelpline; } eTHelpline;
typedef enum {
O_DEFAULT = 0,
O_SCENE,
O_SET,
} eTOType;
/** \} */ /** \} */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@ -607,11 +613,7 @@ typedef struct TransInfo {
float matrix[3][3]; float matrix[3][3];
} orient[3]; } orient[3];
enum { eTOType orient_curr;
O_DEFAULT = 0,
O_SCENE,
O_SET,
} orient_curr;
/** /**
* All values from `TransInfo.orient[].type` converted into a flag * All values from `TransInfo.orient[].type` converted into a flag

10
source/blender/editors/transform/transform_gizmo_3d.cc
View File

@ -2776,15 +2776,17 @@ void transform_gizmo_3d_model_from_constraint_and_mode_set(TransInfo *t)
wmGizmo *gizmo_modal_current = WM_gizmomap_get_modal(t->region->gizmo_map); wmGizmo *gizmo_modal_current = WM_gizmomap_get_modal(t->region->gizmo_map);
if (axis_idx != -1) { if (axis_idx != -1) {
RegionView3D *rv3d = static_cast<RegionView3D *>(t->region->regiondata); RegionView3D *rv3d = static_cast<RegionView3D *>(t->region->regiondata);
bool update_orientation = !(equals_v3v3(rv3d->twmat[0], t->spacemtx[0]) && float(*mat_cmp)[3] = t->orient[t->orient_curr != O_DEFAULT ? t->orient_curr : O_SCENE].matrix;
equals_v3v3(rv3d->twmat[1], t->spacemtx[1]) &&
equals_v3v3(rv3d->twmat[2], t->spacemtx[2])); bool update_orientation = !(equals_v3v3(rv3d->twmat[0], mat_cmp[0]) &&
equals_v3v3(rv3d->twmat[1], mat_cmp[1]) &&
equals_v3v3(rv3d->twmat[2], mat_cmp[2]));
GizmoGroup *ggd = static_cast<GizmoGroup *>(gzgroup_xform->customdata); GizmoGroup *ggd = static_cast<GizmoGroup *>(gzgroup_xform->customdata);
wmGizmo *gizmo_expected = ggd->gizmos[axis_idx]; wmGizmo *gizmo_expected = ggd->gizmos[axis_idx];
if (update_orientation || gizmo_modal_current != gizmo_expected) { if (update_orientation || gizmo_modal_current != gizmo_expected) {
if (update_orientation) { if (update_orientation) {
copy_m4_m3(rv3d->twmat, t->spacemtx); copy_m4_m3(rv3d->twmat, mat_cmp);
copy_v3_v3(rv3d->twmat[3], t->center_global); copy_v3_v3(rv3d->twmat[3], t->center_global);
} }