From 1f7088e5ebf554818d2c9ef3b447969888c0276b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 30 Mar 2016 20:18:05 -1000 Subject: [PATCH] Proper CTransform::multiplyIgnoreTranslation return value --- include/zeus/CTransform.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/zeus/CTransform.hpp b/include/zeus/CTransform.hpp index 9e54cbe..2fc2f8e 100644 --- a/include/zeus/CTransform.hpp +++ b/include/zeus/CTransform.hpp @@ -171,7 +171,12 @@ public: TVectorUnion{0.f, 0.f, factor, 0.f})); } - inline void multiplyIgnoreTranslation(const CTransform& xfrm) { m_basis = m_basis*xfrm.m_basis; } + inline CTransform multiplyIgnoreTranslation(const CTransform& xfrm) + { + CTransform ret; + ret.m_basis = m_basis * xfrm.m_basis; + return ret; + } inline CTransform getRotation() { CTransform ret = *this; ret.m_origin.zeroOut(); return ret; } void setRotation(const CMatrix3f& mat) { m_basis = mat; }