UNMERGE! Refactored R_UpdateEntityLighting to CL_UpdateEntityShading, which sets...

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index b6225fdcf0614a57f5ef2d9d8cc61fd76f94bfd0..492fc353aaa8c9aab1dae9be5174796bf3fb6cca 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -1316,9 +1316,9 @@ void Mod_ShadowMesh_CalcBBox(shadowmesh_t *firstmesh, vec3_t mins, vec3_t maxs,
                }
                for (i = 0, v = mesh->vertex3f;i < mesh->numverts;i++, v += 3)
                {
-                       if (nmins[0] > v[0]) nmins[0] = v[0];if (nmaxs[0] < v[0]) nmaxs[0] = v[0];
-                       if (nmins[1] > v[1]) nmins[1] = v[1];if (nmaxs[1] < v[1]) nmaxs[1] = v[1];
-                       if (nmins[2] > v[2]) nmins[2] = v[2];if (nmaxs[2] < v[2]) nmaxs[2] = v[2];
+                       if (nmins[0] > v[0]) { nmins[0] = v[0]; } if (nmaxs[0] < v[0]) { nmaxs[0] = v[0]; }
+                       if (nmins[1] > v[1]) { nmins[1] = v[1]; } if (nmaxs[1] < v[1]) { nmaxs[1] = v[1]; }
+                       if (nmins[2] > v[2]) { nmins[2] = v[2]; } if (nmaxs[2] < v[2]) { nmaxs[2] = v[2]; }
                }
        }
        // calculate center and radius
@@ -2815,7 +2815,7 @@ nothing                GL_ZERO GL_ONE
                                        if (texture->materialshaderpass->skinframes[0]->hasalpha)
                                                texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
                                        if (texture->q2contents)
-                                               texture->supercontents = Mod_Q2BSP_SuperContentsFromNativeContents(loadmodel, texture->q2contents);
+                                               texture->supercontents = Mod_Q2BSP_SuperContentsFromNativeContents(texture->q2contents);
                                }
                                else
                                        success = false;