Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-03-25 17:32:25 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-03-25 17:36:53 +0300
commit56df673be271c10200d758e0b0e891750103f8d6 (patch)
tree677c4abe65f07129ce1b4300e2b5513641c58509 /source/blender/editors/transform/transform_convert.c
parenta9cd90135afe6e2615ac20ea81c16cb4e0a95534 (diff)
Fix T86796: moving the cursor in the UV Editor does not take aspect into
account UV coords are scaled by aspects (see UVsToTransData). This also applies for the Cursor in the UV Editor which also means that for display and when the cursor coords are flushed (new 'recalcData_cursor_image' was added for this), these need to be converted each time. Maniphest Tasks: T86796 Differential Revision: https://developer.blender.org/D10817
Diffstat (limited to 'source/blender/editors/transform/transform_convert.c')
-rw-r--r--source/blender/editors/transform/transform_convert.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index dd577db01a3..c021c084a23 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1644,6 +1644,21 @@ void animrecord_check_state(TransInfo *t, struct Object *ob)
}
}
+static void recalcData_cursor_image(TransInfo *t)
+{
+ TransDataContainer *tc = t->data_container;
+ TransData *td = tc->data;
+ float aspect_inv[2];
+
+ aspect_inv[0] = 1.0f / t->aspect[0];
+ aspect_inv[1] = 1.0f / t->aspect[1];
+
+ td->loc[0] = td->loc[0] * aspect_inv[0];
+ td->loc[1] = td->loc[1] * aspect_inv[1];
+
+ DEG_id_tag_update(&t->scene->id, ID_RECALC_COPY_ON_WRITE);
+}
+
static void recalcData_cursor(TransInfo *t)
{
DEG_id_tag_update(&t->scene->id, ID_RECALC_COPY_ON_WRITE);
@@ -1678,6 +1693,8 @@ void recalcData(TransInfo *t)
recalcData_curve(t);
break;
case TC_CURSOR_IMAGE:
+ recalcData_cursor_image(t);
+ break;
case TC_CURSOR_VIEW3D:
recalcData_cursor(t);
break;