Merge branch 'develop' into modnark

2022-10-11 22:39:59 -04:00
parent 2dc7f3e667 e62d3ab49c
commit 8916797e55
4 changed files with 16 additions and 1 deletions
--- a/src/source/Application.cpp
+++ b/src/source/Application.cpp
@@ -550,6 +550,7 @@ void Application::onGraphics(RenderDevice* rd) {
 	glEnableClientState(GL_COLOR_ARRAY);
 	glEnableClientState(GL_NORMAL_ARRAY);
 	_dataModel->getWorkspace()->render(rd);
+	_dataModel->getWorkspace()->renderName(rd);
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
 	glDisableClientState(GL_NORMAL_ARRAY);
@@ -759,4 +760,4 @@ void Application::QuitApp()

 void Application::onCreate(HWND parentWindow)
 {
-}
+}