Merge branch 'master' into feature/model-opacity

* Solve conflict in iss.asset

include/openspace/rendering/dashboarditem.h

@@ -52,7 +52,7 @@ public:
     virtual glm::vec2 size() const = 0;
 
 protected:
-    properties::BoolProperty _isEnabled;
+    properties::BoolProperty _enabled;
 };
 
 } // openspace

include/openspace/rendering/renderable.h

@@ -33,6 +33,7 @@
 #include <openspace/properties/stringproperty.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
+#include <string_view>
 
 namespace ghoul { class Dictionary; }
 namespace ghoul::opengl {
@@ -80,6 +81,8 @@ public:
     double boundingSphere() const;
     double interactionSphere() const;
 
+    std::string_view typeAsString() const;
+
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void update(const UpdateData& data);