X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=654d1b630045cacf992e4fe2f862ba25e4616483;hb=4aace403959c72b0449368212b29a7d7dd550355;hp=ffbdf21f3aec4997965064e6e5667a103951931e;hpb=58370d86168c0a67b624b4dec4fe5d296c0d8c99;p=xonotic%2Fdarkplaces.git diff --git a/r_sprites.c b/r_sprites.c index ffbdf21f..654d1b63 100644 --- a/r_sprites.c +++ b/r_sprites.c @@ -362,7 +362,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r { mspriteframe_t *frame; texture_t *texture; - RSurf_ActiveCustomEntity(&identitymatrix, &identitymatrix, ent->flags, 0, ent->colormod[0], ent->colormod[1], ent->colormod[2], ent->alpha * ent->frameblend[i].lerp, 4, vertex3f, spritetexcoord2f, NULL, NULL, NULL, 2, polygonelement3i, polygonelement3s, false, false); + RSurf_ActiveCustomEntity(&identitymatrix, &identitymatrix, ent->flags, 0, ent->colormod[0], ent->colormod[1], ent->colormod[2], ent->alpha * ent->frameblend[i].lerp, 4, vertex3f, spritetexcoord2f, NULL, NULL, NULL, NULL, 2, polygonelement3i, polygonelement3s, false, false); frame = model->sprite.sprdata_frames + ent->frameblend[i].subframe; texture = R_GetCurrentTexture(model->data_textures + ent->frameblend[i].subframe); @@ -380,7 +380,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r R_CalcSprite_Vertex3f(vertex3f, org, left, up, frame->left, frame->right, frame->down, frame->up); - R_DrawCustomSurface(texture->currentskinframe, &identitymatrix, texture->currentmaterialflags, 0, 4, 0, 2, false); + R_DrawCustomSurface_Texture(texture, &identitymatrix, texture->currentmaterialflags, 0, 4, 0, 2, false, false); } }