From 5141fee8c043fc4dcd61c1897cf36f109bf39dd3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 13 Mar 2017 21:16:37 +0100 Subject: [PATCH] - reverted the change of position where polyobjects get linked to the subsectors. --- src/gl/scene/gl_scene.cpp | 1 + src/r_utility.cpp | 2 -- src/swrenderer/scene/r_scene.cpp | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 8b37d7e69c..0a449ba738 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -260,6 +260,7 @@ void GLSceneDrawer::CreateScene() // reset the portal manager GLPortal::StartFrame(); + PO_LinkToSubsectors(); ProcessAll.Clock(); diff --git a/src/r_utility.cpp b/src/r_utility.cpp index 0662269a60..a125fa3480 100644 --- a/src/r_utility.cpp +++ b/src/r_utility.cpp @@ -681,8 +681,6 @@ void R_SetupFrame (FRenderViewpoint &viewpoint, FViewWindow &viewwindow, AActor I_Error ("Tried to render from a NULL actor."); } - PO_LinkToSubsectors(); - player_t *player = actor->player; unsigned int newblend; InterpolationViewer *iview; diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp index 9b37995e15..6ff2fd5941 100644 --- a/src/swrenderer/scene/r_scene.cpp +++ b/src/swrenderer/scene/r_scene.cpp @@ -143,6 +143,9 @@ namespace swrenderer // [RH] Setup particles for this frame P_FindParticleSubsectors(); + // Link the polyobjects right before drawing the scene to reduce the amounts of calls to this function + PO_LinkToSubsectors(); + ActorRenderFlags savedflags = MainThread()->Viewport->viewpoint.camera->renderflags; // Never draw the player unless in chasecam mode if (!MainThread()->Viewport->viewpoint.showviewer)