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:
authorCampbell Barton <campbell@blender.org>2022-08-24 11:59:04 +0300
committerCampbell Barton <campbell@blender.org>2022-08-24 11:59:04 +0300
commit8c38a994c6b7728d4eae21626b566bcc13376c49 (patch)
tree472239dd570b7f76ce2b8d9161c36e7c0fca783a
parent62f764fad7c3086287c4634ade3f4c2d3b40a694 (diff)
Fix Quaternion.rotate(matrix) with negative matrices
Rotating a quaternion by a negative matrix gave an invalid result. Follow up fix for T94231 which negated negative matrices too.
-rw-r--r--source/blender/python/mathutils/mathutils_Quaternion.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c
index 6994a313237..4972381d29e 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.c
+++ b/source/blender/python/mathutils/mathutils_Quaternion.c
@@ -543,8 +543,13 @@ static PyObject *Quaternion_rotate(QuaternionObject *self, PyObject *value)
length = normalize_qt_qt(tquat, self->quat);
quat_to_mat3(self_rmat, tquat);
mul_m3_m3m3(rmat, other_rmat, self_rmat);
-
- mat3_to_quat(self->quat, rmat);
+ normalize_m3(rmat);
+ /* This check could also be performed on `other_rmat`, use the final result instead to ensure
+ * float imprecision doesn't allow the multiplication to make `rmat` negative. */
+ if (is_negative_m3(rmat)) {
+ negate_m3(rmat);
+ }
+ mat3_normalized_to_quat(self->quat, rmat);
mul_qt_fl(self->quat, length); /* maintain length after rotating */
(void)BaseMath_WriteCallback(self);