#5955: Fix player start not being rendered (in a new map) after a lar…

…ge map has been loaded.

The code to determine whether a 4-component colour is "less" than another (as used in the shader pass sorting) was prone to collisions.

include/version.h

@@ -4,7 +4,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "3.0.0pre5"
+#define RADIANT_VERSION "3.0.0pre6"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

radiantcore/rendersystem/backend/OpenGLStateLess.h

@@ -8,8 +8,12 @@ namespace render
 // Compare two Colour4 values
 inline bool Colour4_less(const Colour4& a, const Colour4& b)
 {
-    return a.x() * a.x() + a.y() * a.y() + a.z() * a.z() + a.w() * a.w() <
-           b.x() * b.x() + b.y() * b.y() + b.z() * b.z() + b.w() * b.w();
+    if (a.x() != b.x()) return a.x() < b.x();
+    if (a.y() != b.y()) return a.y() < b.y();
+    if (a.z() != b.z()) return a.z() < b.z();
+    if (a.w() != b.w()) return a.w() < b.w();
+
+    return false;
 }
 
 /**