Merge branch 'master' into terencehill/screenshot_viewer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / csqcmodel_hooks.qc

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index c2908766b34273356f67284f2217b89a709c6553..152ecbe82e998e398d35fcd0a8a1f0cbc37a811b 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -14,6 +14,9 @@ void CSQCPlayer_LOD_Apply(void)
                string modelname = self.model;
                string s;
 
+               vector mi = self.mins;
+               vector ma = self.maxs;
+
                // set modelindex
                self.lodmodelindex0 = self.modelindex;
                self.lodmodelindex1 = self.modelindex;
@@ -39,6 +42,7 @@ void CSQCPlayer_LOD_Apply(void)
                }
 
                setmodel(self, modelname); // make everything normal again
+               setsize(self, mi, ma);
        }
 
        // apply LOD
@@ -287,6 +291,7 @@ void CSQCModel_AutoTagIndex_Apply(void)
                }
 
                // recursive predraw call to fix issues with forcemodels and LOD if bone indexes mismatch
+               if(self.tag_entity.classname == "csqcmodel")
                {
                        entity oldself = self;
                        self = self.tag_entity;