Network model scale, mins & maxs, link sandbox & breakable models with CSQC

[xonotic/xonotic-data.pk3dir.git] / qcsrc / csqcmodellib / cl_model.qc

diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc
index 2c7bc2d925da89fc0c1d971ad86e2ca696cddb2c..3333096423ec0b04337349dd5985f1bdcd5d9fbf 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -236,8 +236,11 @@ void CSQCModel_Read(float isnew)
 #undef CSQCMODEL_IF
 
        if(sf & CSQCMODEL_PROPERTY_MODELINDEX)
+       {
+               vector oldmins = self.mins, oldmaxs = self.maxs;
                setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax
-               // FIXME do we WANT this to override mins/maxs?
+               setsize(self, oldmins, oldmaxs);
+       }
 
        if(sf & CSQCMODEL_PROPERTY_TELEPORTED)
        {