diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-18 18:19:37 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-18 18:19:37 +0300 |
| commit | 56ef6fdb9ec4ffdbf2a30a6676185139c8d8a138 (patch) | |
| tree | 63d81c2c44c1e240a602c1806402c9dd7bfdff48 /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | 898231fdbcc34785fefa2030bf9c17dbdedfb63f (diff) | |
| parent | 9a8f5022b70f3b33968b61b54f2b2c785b2f5145 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 124ef950385..4152e8633e5 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -340,13 +340,16 @@ static void BMD_mesh_intersection(BMesh *bm, * other than 0, -1, or 1 in the scaling part of the matrix. */ float cleaned_object_obmat[4][4]; + float cleaned_operand_obmat[4][4]; clean_obmat(cleaned_object_obmat, object->obmat); invert_m4_m4(imat, cleaned_object_obmat); + clean_obmat(cleaned_operand_obmat, operand_ob->obmat); + mul_m4_m4m4(omat, imat, cleaned_operand_obmat); } else { invert_m4_m4(imat, object->obmat); + mul_m4_m4m4(omat, imat, operand_ob->obmat); } - mul_m4_m4m4(omat, imat, operand_ob->obmat); BMVert *eve; i = 0; |