From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 1 Apr 2009 13:56:23 +0000 (+0000)
Subject: set rsurface.entity correctly before calling R_GetCurrentTexture
X-Git-Tag: xonotic-v0.1.0preview~1769
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cd6ce23bdc219b0dc059e27f8e803ffeda698f3;p=xonotic%2Fdarkplaces.git

set rsurface.entity correctly before calling R_GetCurrentTexture


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

diff --git a/r_sprites.c b/r_sprites.c
index f98eb130..bf5a8f9f 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -208,6 +208,9 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 	int edge = 0;
 	float dir_angle = 0.0f;
 
+	// R_GetCurrentTexture needs this
+	rsurface.entity = (entity_render_t *)ent;
+
 	// nudge it toward the view to make sure it isn't in a wall
 	Matrix4x4_ToVectors(&ent->matrix, mforward, mleft, mup, org);
 	VectorSubtract(org, r_refdef.view.forward, org);
@@ -395,6 +398,8 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 			}
 		}
 	}
+
+	rsurface.entity = NULL;
 }
 
 void R_Model_Sprite_Draw(entity_render_t *ent)