Added missing include and merged master into NewAtmosphere.

modules/base/rendering/screenspaceframebuffer.cpp

@@ -66,7 +66,12 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
     );
 
     _id = id();
-    setName("ScreenSpaceFramebuffer" + std::to_string(_id));
+    if (_id == 0) {
+        setName("ScreenSpaceFramebuffer");
+    }
+    else {
+        setName("ScreenSpaceFramebuffer " + std::to_string(_id));
+    }
 
     glm::vec2 resolution = OsEng.windowWrapper().currentWindowResolution();
     addProperty(_size);

modules/base/rendering/screenspaceimagelocal.cpp

@@ -89,7 +89,12 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
     }
     else {
         static int id = 0;
-        setName("ScreenSpaceImageLocal " + std::to_string(id));
+        if (id == 0) {
+            setName("ScreenSpaceImageLocal");
+        }
+        else {
+            setName("ScreenSpaceImageLocal " + std::to_string(id));
+        }
         ++id;
     }
 

modules/base/rendering/screenspaceimageonline.cpp

@@ -89,7 +89,12 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
     }
     else {
         static int id = 0;
-        setName("ScreenSpaceImageOnline " + std::to_string(id));
+        if (id == 0) {
+            setName("ScreenSpaceImageOnline");
+        }
+        else {
+            setName("ScreenSpaceImageOnline " + std::to_string(id));
+        }
         ++id;
     }