[Bf-blender-cvs] [b65ab293105] blender-v3.3-release: Sculpt: Fix T99294: Voxel Remesher text is resized based on object scale
Joseph Eagar
noreply at git.blender.org
Thu Aug 4 00:06:03 CEST 2022
Commit: b65ab293105d3dfceee8f3bafa3936cfebad8200
Author: Joseph Eagar
Date: Wed Aug 3 15:05:07 2022 -0700
Branches: blender-v3.3-release
https://developer.blender.org/rBb65ab293105d3dfceee8f3bafa3936cfebad8200
Sculpt: Fix T99294: Voxel Remesher text is resized based on object scale
===================================================================
M source/blender/editors/object/object_remesh.cc
===================================================================
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);
More information about the Bf-blender-cvs
mailing list