fix a bug in AUTOSPRITE2 code caused by overzealous optimization, thanks to Elric...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6308 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rmain.c b/gl_rmain.c
index 6fdd91fdc2f58f5b1d396f9fe6ae2bb8b4d52213..c4f0c63291f7ce9a4ca3ca15a4709e3588538177 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2492,17 +2492,6 @@ void RSurf_PrepareVerticesForBatch(const entity_render_t *ent, const texture_t *
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewforward, forward);
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewright, right);
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewup, up);
-               if (rsurface_texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2)
-               {
-                       forward[0] = rsurface_modelorg[0] - center[0];
-                       forward[1] = rsurface_modelorg[1] - center[1];
-                       forward[2] = 0;
-                       VectorNormalize(forward);
-                       right[0] = forward[1];
-                       right[1] = -forward[0];
-                       right[2] = 0;
-                       VectorSet(up, 0, 0, 1);
-               }
                // make deformed versions of only the vertices used by the specified surfaces
                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
@@ -2515,6 +2504,17 @@ void RSurf_PrepareVerticesForBatch(const entity_render_t *ent, const texture_t *
                                for (i = 0;i < 4;i++)
                                        VectorAdd(center, (rsurface_vertex3f + 3 * surface->num_firstvertex) + (j+i) * 3, center);
                                VectorScale(center, 0.25f, center);
+                               if (rsurface_texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2)
+                               {
+                                       forward[0] = rsurface_modelorg[0] - center[0];
+                                       forward[1] = rsurface_modelorg[1] - center[1];
+                                       forward[2] = 0;
+                                       VectorNormalize(forward);
+                                       right[0] = forward[1];
+                                       right[1] = -forward[0];
+                                       right[2] = 0;
+                                       VectorSet(up, 0, 0, 1);
+                               }
                                // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out?
                                Matrix4x4_FromVectors(&matrix1, (rsurface_normal3f + 3 * surface->num_firstvertex) + j*3, (rsurface_svector3f + 3 * surface->num_firstvertex) + j*3, (rsurface_tvector3f + 3 * surface->num_firstvertex) + j*3, center);
                                Matrix4x4_Invert_Simple(&imatrix1, &matrix1);