Merge branch 'featureCoreProfile' into 'master'

Core Profile support

See merge request !2

ObjectTypes/MeshObject/MeshObjectT.cc

@@ -226,12 +226,13 @@
     std::string shaderDirectory = std::string( shaderDir.toUtf8() );
     shaderNode_->setShaderDir( shaderDirectory );
 
-
-    if ( QFile( shaderDir + "Phong/Vertex.glsl").exists() && QFile( shaderDir + "Phong/Fragment.glsl" ).exists() )
-      shaderNode_->setShader(ACG::SceneGraph::DrawModes::SOLID_PHONG_SHADED,"Phong/Vertex.glsl" , "Phong/Fragment.glsl" );
-    else
-      std::cerr << "Shader Files for Phong not found!" << std::endl;
-
+    if(!OpenFlipper::Options::coreProfile())
+    {
+        if ( QFile( shaderDir + "Phong/Vertex.glsl").exists() && QFile( shaderDir + "Phong/Fragment.glsl" ).exists() )
+            shaderNode_->setShader(ACG::SceneGraph::DrawModes::SOLID_PHONG_SHADED,"Phong/Vertex.glsl" , "Phong/Fragment.glsl" );
+        else
+            std::cerr << "Shader Files for Phong not found!" << std::endl;
+    }
 
     // Node showing selection
     statusNode_ = new ACG::SceneGraph::SelectionNodeT<MeshT>(*mesh_, 0, "NEW StatusNode for mesh " );