Revert "Fixed DearIMGUI debug assert - missing EndFrame()"

This reverts commit 627d85b.
Zentro · Feb 21, 2022 · 918bdf8 · 918bdf8
1 parent f26e5a7
commit 918bdf8
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/source/main/gui/imgui/OgreImGui.cpp b/source/main/gui/imgui/OgreImGui.cpp
@@ -137,18 +137,11 @@ void OgreImGui::renderQueueStarted(Ogre::uint8 queueGroupId,
         Ogre::Viewport* vp = Ogre::Root::getSingletonPtr()->getRenderSystem()->_getViewport();
         if(vp != NULL)
         {
-            if (vp->getOverlaysEnabled())
+            Ogre::SceneManager* sceneMgr = vp->getCamera()->getSceneManager();
+            if (vp->getOverlaysEnabled() && sceneMgr->_getCurrentRenderStage() != Ogre::SceneManager::IRS_RENDER_TO_TEXTURE)
             {
-                Ogre::SceneManager* sceneMgr = vp->getCamera()->getSceneManager();
-                if (sceneMgr->_getCurrentRenderStage() != Ogre::SceneManager::IRS_RENDER_TO_TEXTURE)
-                {
-                    //ORIG//Ogre::OverlayManager::getSingleton()._queueOverlaysForRendering(vp->getCamera(), sceneMgr->getRenderQueue(), vp);
-                    m_imgui_overlay->_findVisibleObjects(vp->getCamera(), sceneMgr->getRenderQueue(), vp);
-                }
-            }
-            else
-            {
-                ImGui::EndFrame(); // Rendering won't happen - end frame manually.
+                //ORIG//Ogre::OverlayManager::getSingleton()._queueOverlaysForRendering(vp->getCamera(), sceneMgr->getRenderQueue(), vp);
+                m_imgui_overlay->_findVisibleObjects(vp->getCamera(), sceneMgr->getRenderQueue(), vp);
             }
         }
     }