From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 23 Dec 2011 22:38:55 +0000 (+0100)
Subject: fix misc_gamemodel bbox when using modelscale
X-Git-Tag: xonotic-v0.6.0~74^2~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d76a1cf6c919ad80bf21e3dcd80e9c3c093dd68;p=xonotic%2Fxonotic-data.pk3dir.git

fix misc_gamemodel bbox when using modelscale
---

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 690fd752d..befdb9bcc 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -128,15 +128,15 @@ float g_clientmodel_genericsendentity (entity to, float sf)
 
 
 #define G_MODEL_INIT(sol) \
-	SetBrushEntityModel(); \
 	if(!self.scale) self.scale = self.modelscale; \
+	SetBrushEntityModel(); \
 	self.use = g_model_setcolormaptoactivator; \
 	InitializeEntity(self, g_model_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
 	if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT;
 
 #define G_CLIENTMODEL_INIT(sol) \
-	SetBrushEntityModel(); \
 	if(!self.scale) self.scale = self.modelscale; \
+	SetBrushEntityModel(); \
 	self.use = g_clientmodel_setcolormaptoactivator; \
 	InitializeEntity(self, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
 	if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; \