From c2b7f5173f9c6ce50a81c56f2e9324a3b19eadea Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Sat, 11 Jun 2011 20:20:30 +0000
Subject: [PATCH] Fix forgotten IQM2 support in iqm.h, patch by Zack Middleton

---
 code/renderer/iqm.h          | 8 ++++----
 code/renderer/tr_model_iqm.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/renderer/iqm.h b/code/renderer/iqm.h
index e487ef49..ab2247ac 100644
--- a/code/renderer/iqm.h
+++ b/code/renderer/iqm.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __IQM_H__
 
 #define IQM_MAGIC "INTERQUAKEMODEL"
-#define IQM_VERSION 1
+#define IQM_VERSION 2
 
 #define	IQM_MAX_JOINTS		128
 
@@ -86,15 +86,15 @@ typedef struct iqmjoint
 {
     unsigned int name;
     int parent;
-    float translate[3], rotate[3], scale[3];
+    float translate[3], rotate[4], scale[3];
 } iqmJoint_t;
 
 typedef struct iqmpose
 {
     int parent;
     unsigned int mask;
-    float channeloffset[9];
-    float channelscale[9];
+    float channeloffset[10];
+    float channelscale[10];
 } iqmPose_t;
 
 typedef struct iqmanim
diff --git a/code/renderer/tr_model_iqm.c b/code/renderer/tr_model_iqm.c
index 76f8c14c..0e4672a1 100644
--- a/code/renderer/tr_model_iqm.c
+++ b/code/renderer/tr_model_iqm.c
@@ -726,7 +726,7 @@ R_ComputeIQMFogNum
 int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) {
 	int			i, j;
 	fog_t			*fog;
-	vec_t			*bounds;
+	const vec_t		*bounds;
 	const vec_t		defaultBounds[6] = { -8, -8, -8, 8, 8, 8 };
 	vec3_t			diag, center;
 	vec3_t			localOrigin;