Merge remote branch 'origin/master'

diff --combined qcsrc/client/csqcmodel_hooks.qc
index 60a56ad5a4839fdfa994bb4d40d760e5b1c0625a,b40f054ac0b25ddf28e66b856d5f4b78ea442f8b..a0a6e150e373dee3a051e175a75e8842cd4a4618
--- 1/qcsrc/client/csqcmodel_hooks.qc
--- 2/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -207,6 -207,8 +207,6 @@@ void CSQCPlayer_ForceModel_Apply(float 
  .float csqcmodel_saveframe4;
  .float csqcmodel_framecount;
  
 -.float csqcmodel_isdead; // for utility code
 -
  #define IS_DEAD_FRAME(f) ((f) == 0 || (f) == 1)
  void CSQCPlayer_FallbackFrame_PreUpdate(void)
  {
@@@ -463,8 -465,9 +463,9 @@@ void CSQCPlayer_GlowMod_Apply(void
                {
                        self.glowmod = self.glowmod * bound(0, 1 - (time - self.death_time) / autocvar_cl_deathglow, 1);
                        // prevent the zero vector
-                       if(self.glowmod_x == 0)
-                               self.glowmod_x = -1;
+                       self.glowmod_x = max(self.glowmod_x, 0.0001);
+                       self.glowmod_y = max(self.glowmod_y, 0.0001);
+                       self.glowmod_z = max(self.glowmod_z, 0.0001);
                }
  }