static void R_DrawLocs(void);
static void R_DrawEntityBBoxes(prvm_prog_t *prog);
static void R_DrawModelDecals(void);
-extern cvar_t cl_decals_newsystem;
extern qboolean r_shadow_usingdeferredprepass;
extern int r_shadow_shadowmapatlas_modelshadows_size;
void R_RenderScene(int viewfbo, rtexture_t *viewdepthtexture, rtexture_t *viewcolortexture, int viewx, int viewy, int viewwidth, int viewheight)
if (cl.csqc_vidvars.drawworld)
{
- if (cl_decals_newsystem.integer)
- {
- R_DrawModelDecals();
- if (r_timereport_active)
- R_TimeReport("modeldecals");
- }
- else
- {
- R_DrawDecals();
- if (r_timereport_active)
- R_TimeReport("decals");
- }
+ R_DrawModelDecals();
+ if (r_timereport_active)
+ R_TimeReport("modeldecals");
R_DrawParticles();
if (r_timereport_active)
float worldmaxs[3];
entity_render_t *ent;
- if (!cl_decals_newsystem.integer)
- return;
-
worldmins[0] = worldorigin[0] - worldsize;
worldmins[1] = worldorigin[1] - worldsize;
worldmins[2] = worldorigin[2] - worldsize;
{
r_decalsystem_splatqueue_t *queue;
- if (!cl_decals_newsystem.integer || r_decalsystem_numqueued == MAX_DECALSYSTEM_QUEUE)
+ if (r_decalsystem_numqueued == MAX_DECALSYSTEM_QUEUE)
return;
queue = &r_decalsystem_queue[r_decalsystem_numqueued++];
r_refdef.stats[r_stat_totaldecals] += numdecals;
- if (r_showsurfaces.integer)
+ if (r_showsurfaces.integer || !r_drawdecals.integer)
return;
R_DrawModelDecals_Entity(r_refdef.scene.worldentity);