griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #127253: Compositor crop gizmo can produce invalid crop configurations

Browse Source 
After 4bf08198a7 it it no longer necessary to flip gizmo bounds if they are not valid.

Note: it is still possible to create an invalid crop and "losing" the gizmo if it is dragged and dropped outside the compositor canvas. This will be addressed in a different patch.

Pull Request: https://projects.blender.org/blender/blender/pulls/127656
This commit is contained in:
Habib Gahbiche
2024-09-26 19:24:14 +02:00
committed by Habib Gahbiche
parent fa33eb65bf
commit a537659341
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/space_node/node_gizmo.cc
View File

@@ -215,14 +215,14 @@ static void two_xy_to_rect(
if (is_relative) {
r_rect->xmin = nxy->fac_x1 + (offset.x / dims.x);
r_rect->xmax = nxy->fac_x2 + (offset.x / dims.x);
r_rect->ymin = nxy->fac_y1 + (offset.y / dims.y);
r_rect->ymax = nxy->fac_y2 + (offset.y / dims.y);
r_rect->ymin = nxy->fac_y2 + (offset.y / dims.y);
r_rect->ymax = nxy->fac_y1 + (offset.y / dims.y);
}
else {
r_rect->xmin = (nxy->x1 + offset.x) / dims.x;
r_rect->xmax = (nxy->x2 + offset.x) / dims.x;
r_rect->ymin = (nxy->y1 + offset.y) / dims.y;
r_rect->ymax = (nxy->y2 + offset.y) / dims.y;
r_rect->ymin = (nxy->y2 + offset.y) / dims.y;
r_rect->ymax = (nxy->y1 + offset.y) / dims.y;
}
}
@@ -232,14 +232,14 @@ static void two_xy_from_rect(
if (is_relative) {
nxy->fac_x1 = rect->xmin - (offset.x / dims.x);
nxy->fac_x2 = rect->xmax - (offset.x / dims.x);
nxy->fac_y1 = rect->ymin - (offset.y / dims.y);
nxy->fac_y2 = rect->ymax - (offset.y / dims.y);
nxy->fac_y2 = rect->ymin - (offset.y / dims.y);
nxy->fac_y1 = rect->ymax - (offset.y / dims.y);
}
else {
nxy->x1 = rect->xmin * dims.x - offset.x;
nxy->x2 = rect->xmax * dims.x - offset.x;
nxy->y1 = rect->ymin * dims.y - offset.y;
nxy->y2 = rect->ymax * dims.y - offset.y;
nxy->y2 = rect->ymin * dims.y - offset.y;
nxy->y1 = rect->ymax * dims.y - offset.y;
}
}
@@ -278,8 +278,6 @@ static void gizmo_node_crop_prop_matrix_set(const wmGizmo *gz,
bool is_relative = bool(node->custom2);
rctf rct;
two_xy_to_rect(nxy, dims, offset, is_relative, &rct);
const bool nx = rct.xmin > rct.xmax;
const bool ny = rct.ymin > rct.ymax;
BLI_rctf_resize(&rct, fabsf(matrix[0][0]), fabsf(matrix[1][1]));
BLI_rctf_recenter(&rct, ((matrix[3][0]) / dims[0]) + 0.5f, ((matrix[3][1]) / dims[1]) + 0.5f);
rctf rct_isect{};
@@ -288,12 +286,6 @@ static void gizmo_node_crop_prop_matrix_set(const wmGizmo *gz,
rct_isect.ymin = offset.y;
rct_isect.ymax = offset.y / dims.y + 1;
BLI_rctf_isect(&rct_isect, &rct, &rct);
if (nx) {
std::swap(rct.xmin, rct.xmax);
}
if (ny) {
std::swap(rct.ymin, rct.ymax);
}
two_xy_from_rect(nxy, &rct, dims, offset, is_relative);
gizmo_node_crop_update(crop_group);
}