fixed func_static model dragging

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@92 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 9c179bd12cfe4243e8b436af87e797299bc5a181..d1ecd022fb2dd32865dfb4a698651fd0ad617c82 100644 (file)
--- 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)
 
 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.
 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 72048bdbaa3ac7041a14a086e4a89e004f22f3c2..4fbc0ccfb7b20c86162408f75b2132c0489d094a 100644 (file)
--- a/plugins/entity/doom3group.cpp
+++ b/plugins/entity/doom3group.cpp
@@ -228,8 +228,8 @@ private:
     m_transform.localToParent() = g_matrix4_identity;
     if(isModel())
     {
     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())
     }
     m_transformChanged();
     if(!isModel())