Resolved .gitignore conflict

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index d164550d78b37c7f6c266d90ddeb29254df53a48..f9bc7499d8a2eca54914a06de4efc1c1a81f213c 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3447,6 +3447,7 @@ void Render_Init(void)
        R_Particles_Init();
        R_Explosion_Init();
        R_LightningBeams_Init();
+       CL_MeshEntities_Init();
        Mod_RenderInit();
 }