Missed the cl_particles.c edits to remove RSurf_ActiveWorldEntity. I blame VS2017...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12372 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7407bbbcf97cc0f105b00c1affdadc84febdf245

diff --git a/cl_particles.c b/cl_particles.c
index 0fe0be4d09c7263c61ed59857b0899ac13b61601..5e873998d1e7f1ee2bf4c35a9fb4da8ba2614417 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -2500,7 +2500,7 @@ static void R_DrawDecal_TransparentCallback(const entity_render_t *ent, const rt
        vec_t right[3], up[3], size, ca;
        float alphascale = (1.0f / 65536.0f) * cl_particles_alpha.value;
 
-       RSurf_ActiveWorldEntity();
+       RSurf_ActiveModelEntity(r_refdef.scene.worldentity, false, false, false);
 
        r_refdef.stats[r_stat_drawndecals] += numsurfaces;
 //     R_Mesh_ResetTextureState();
@@ -2659,7 +2659,7 @@ static void R_DrawParticle_TransparentCallback(const entity_render_t *ent, const
        float minparticledist_start, minparticledist_end;
        qboolean dofade;
 
-       RSurf_ActiveWorldEntity();
+       RSurf_ActiveModelEntity(r_refdef.scene.worldentity, false, false, false);
 
        Vector4Set(colormultiplier, r_refdef.view.colorscale * (1.0 / 256.0f), r_refdef.view.colorscale * (1.0 / 256.0f), r_refdef.view.colorscale * (1.0 / 256.0f), cl_particles_alpha.value * (1.0 / 256.0f));