Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +6 -12
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e71650920a - Show all commits

9
source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
View File

@ -1141,12 +1141,9 @@ static int gizmo_cage2d_modal(bContext *C,
} }
} }
if (delta_orig < 0) { /* Original cursor position does not exactly lie on the cage boundary due to margin. */
scale[i] = -delta_curr / (pivot[i] + 0.5f); const float delta_boundary = signf(delta_orig) * 0.5f - pivot[i];
} scale[i] = delta_curr / delta_boundary;
else {
scale[i] = delta_curr / (0.5f - pivot[i]);
}
} }
} }

9
source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
View File

@ -539,12 +539,9 @@ static int gizmo_cage3d_modal(bContext *C,
} }
} }
if (delta_orig < 0) { /* Original cursor position does not exactly lie on the cage boundary due to margin. */
scale[i] = -delta_curr / (pivot[i] + 0.5f); const float delta_boundary = signf(delta_orig) * 0.5f - pivot[i];
} scale[i] = delta_curr / delta_boundary;
else {
scale[i] = delta_curr / (0.5f - pivot[i]);
}
} }
} }