Merge branch 'feature/DUUpdates' into integration/FXAA_Vol_Milkway

modules/digitaluniverse/rendering/renderabledumeshes.cpp

@@ -710,14 +710,16 @@ bool RenderableDUMeshes::readSpeckFile() {
             continue;
         }
 
-        if (line.substr(0, 4) != "mesh") {
+        std::size_t found = line.find("mesh");
+        if (found == std::string::npos) {
+        //if (line.substr(0, 4) != "mesh") {
             // we read a line that doesn't belong to the header, so we have to jump back
             // before the beginning of the current line
             file.seekg(position);
             break;
-        }
+        } else {
 
-        if (line.substr(0, 4) == "mesh") {
+        //if (line.substr(0, 4) == "mesh") {
             // mesh lines are structured as follows:
             // mesh -t texnum -c colorindex -s style {
             // where textnum is the index of the texture;

modules/space/shaders/star_fs.glsl

@@ -104,6 +104,7 @@ Fragment getFragment() {
     frag.depth     = gs_screenSpaceDepth;
     frag.gPosition = vs_position;
     frag.gNormal   = vec4(0.0, 0.0, 0.0, 1.0);
+    frag.disableLDR2HDR = true;
     
     return frag;
 }