#6081: Remove unused RENDER_POINT_COLOUR flag.

codereader · Sep 3, 2022 · 859a4b2 · 859a4b2
1 parent 1a84144
commit 859a4b2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -83,12 +83,10 @@ const unsigned RENDER_FILL = 1 << 14;
 const unsigned RENDER_VERTEX_COLOUR = 1 << 15;
 
 /**
- * If enabled, point geometry may submit colours for each point. If disabled,
- * point geometry must not change colour during rendering.
- *
- * Does not affect GL state.
+ * If enabled, the renderer will apply the state's colour by calling glColor.
+ * If not enabled, a white colour will be used.
  */
-const unsigned RENDER_POINT_COLOUR = 1 << 16;
+const unsigned RENDER_COLOUR = 1 << 16;
 
 /// GL_TEXTURE_2D will be enabled during rendering.
 const unsigned RENDER_TEXTURE_2D = 1 << 17;

diff --git a/include/version.h b/include/version.h
@@ -4,7 +4,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "3.2.0"
+#define RADIANT_VERSION "3.3.0pre1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/radiant/camera/CamWnd.cpp b/radiant/camera/CamWnd.cpp
@@ -744,8 +744,7 @@ void CamWnd::Cam_Draw()
                                      | RENDER_BLEND
                                      | RENDER_CULLFACE
                                      | RENDER_OFFSETLINE
-                                     | RENDER_VERTEX_COLOUR
-                                     | RENDER_POINT_COLOUR;
+                                     | RENDER_VERTEX_COLOUR;
 
     // Add mode-specific render flags
     switch (getCameraSettings()->getRenderMode())

diff --git a/radiant/xyview/XYWnd.cpp b/radiant/xyview/XYWnd.cpp
@@ -1353,7 +1353,7 @@ void XYWnd::draw()
 
     glLoadMatrixd(_modelView);
 
-    unsigned int flagsMask = RENDER_POINT_COLOUR | RENDER_VERTEX_COLOUR;
+    unsigned int flagsMask = RENDER_VERTEX_COLOUR;
 
     if (!getCameraSettings()->solidSelectionBoxes())
     {

diff --git a/radiantcore/rendersystem/backend/BuiltInShader.cpp b/radiantcore/rendersystem/backend/BuiltInShader.cpp
@@ -378,7 +378,6 @@ void BuiltInShader::constructCameraMergeActionOverlay(OpenGLState& pass, const C
 
 void BuiltInShader::constructPointShader(OpenGLState& pass, float pointSize, OpenGLState::SortPosition sort)
 {
-    pass.setRenderFlag(RENDER_POINT_COLOUR);
     pass.setRenderFlag(RENDER_DEPTHWRITE);
 
     pass.setSortPosition(sort);