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:
authorJoseph Eagar <joeedh@gmail.com>2022-08-04 01:05:07 +0300
committerJoseph Eagar <joeedh@gmail.com>2022-08-04 01:05:56 +0300
commitb65ab293105d3dfceee8f3bafa3936cfebad8200 (patch)
tree02397d5b20f2b7c3f848fda9a000b6cf21794cfa /source/blender/editors/object
parent1cc11e32e4acefa095b5a851d49172c0972fc261 (diff)
Sculpt: Fix T99294: Voxel Remesher text is resized based on object scale
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_remesh.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index 8a7138b25ac..d44af45a015 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -577,10 +577,18 @@ static int voxel_size_edit_invoke(bContext *C, wmOperator *op, const wmEvent *ev
/* Use the Bounding Box face normal as the basis Z. */
normal_tri_v3(cd->text_mat[2], cd->preview_plane[0], cd->preview_plane[1], cd->preview_plane[2]);
+ /* Invert object scale. */
+ float scale[3];
+ mat4_to_size(scale, active_object->obmat);
+ invert_v3(scale);
+ size_to_mat4(scale_mat, scale);
+
+ mul_m4_m4_pre(cd->text_mat, scale_mat);
+
/* Write the text position into the matrix. */
copy_v3_v3(cd->text_mat[3], text_pos);
- /* Scale the text. */
+ /* Scale the text to constant viewport size. */
float text_pos_word_space[3];
mul_v3_m4v3(text_pos_word_space, active_object->obmat, text_pos);
const float pixelsize = ED_view3d_pixel_size(rv3d, text_pos_word_space);