From: spog <spog@8a3a26a2-13c4-0310-b231-cf6edde360e5>
Date: Sat, 22 Jul 2006 11:22:54 +0000 (+0000)
Subject: fixed func_static model dragging
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5f0d553f9259e099c7944c4d6fcbe716ac6baaf;p=xonotic%2Fnetradiant.git

fixed func_static model dragging

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@92 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/CHANGES b/CHANGES
index 9c179bd1..d1ecd022 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+22/07/2006
+SPoG
+- Fixed doom3 func_static with model not appearing to move when dragged. 
+
 09/07/2006
 Shaderman
 - Updated win32 libxml2 package to 2.6.24.
diff --git a/plugins/entity/doom3group.cpp b/plugins/entity/doom3group.cpp
index 72048bdb..4fbc0ccf 100644
--- a/plugins/entity/doom3group.cpp
+++ b/plugins/entity/doom3group.cpp
@@ -228,8 +228,8 @@ private:
     m_transform.localToParent() = g_matrix4_identity;
     if(isModel())
     {
-      matrix4_translate_by_vec3(m_transform.localToParent(), m_originKey.m_origin);
-      matrix4_multiply_by_matrix4(m_transform.localToParent(), rotation_toMatrix(m_rotationKey.m_rotation));
+      matrix4_translate_by_vec3(m_transform.localToParent(), m_origin);
+      matrix4_multiply_by_matrix4(m_transform.localToParent(), rotation_toMatrix(m_rotation));
     }
     m_transformChanged();
     if(!isModel())