Merge fix

modules/iswa/rendering/dataplane.cpp

@@ -67,6 +67,10 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
     addProperty(_backgroundValues);
     addProperty(_transferFunctionsFile);
     addProperty(_dataOptions);
+
+    _programName = "DataPlaneProgram";
+    _vsPath = "${MODULE_ISWA}/shaders/dataplane_vs.glsl";
+    _fsPath = "${MODULE_ISWA}/shaders/dataplane_fs.glsl";
 }
 
 DataPlane::~DataPlane(){}
@@ -254,7 +258,7 @@ bool DataPlane::updateTexture(){
     return false;
 }
 
-bool DataPlane::readyToRender(){
+bool DataPlane::readyToRender() const {
     return (!_textures.empty());
 }
 
@@ -322,18 +326,6 @@ void DataPlane::setUniformAndTextures(){
     _shader->setUniform("transparency", _alpha.value());
 }
 
-bool DataPlane::createShader(){
-    if (_shader == nullptr) {
-        // DatePlane Program
-        RenderEngine& renderEngine = OsEng.renderEngine();
-        _shader = renderEngine.buildRenderProgram("DataPlaneProgram",
-            "${MODULE_ISWA}/shaders/dataplane_vs.glsl",
-            "${MODULE_ISWA}/shaders/dataplane_fs.glsl"
-            );
-        if (!_shader) return false;
-    }
-}
-
 void DataPlane::setTransferFunctions(std::string tfPath){
     std::string line;
     std::ifstream tfFile(absPath(tfPath));