]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Don't duplicate the entity relinking when using CSQC.
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 7 Apr 2018 19:14:39 +0000 (19:14 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Aug 2018 17:22:45 +0000 (17:22 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12366 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=85b3fedf1e968fb413bac5730e8f9627de987acb

cl_main.c

index ebde7dae978654ee2e576c4a951e77c8c3e0af65..dbb774afc77097c00872e9ec210f4989470f520d 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -1948,7 +1948,9 @@ void CL_UpdateWorld(void)
                // update the engine-based viewmodel
                CL_UpdateViewModel();
 
-               CSQC_RelinkAllEntities(ENTMASK_ENGINE | ENTMASK_ENGINEVIEWMODELS);
+               // when csqc is loaded, it will call this in CSQC_UpdateView
+               if (!cl.csqc_loaded)
+                       CSQC_RelinkAllEntities(ENTMASK_ENGINE | ENTMASK_ENGINEVIEWMODELS);
 
                // decals, particles, and explosions will be updated during rneder
        }