* Fixed possible OpenGL stack overflow in DataContainerInspectorCanvas.

* Added OpenGL thread guard to image conversions to ImageRepresentationGL.

application/gui/datacontainerinspectorcanvas.cpp

@@ -167,16 +167,16 @@ namespace campvis {
             _geometriesDirty = false;
         }
 
+        if (_textures.empty()) {
+            return;
+        }
+
         glPushAttrib(GL_ALL_ATTRIB_BITS);
         glViewport(0, 0, size_.x, size_.y);
         glClearColor(0.7f, 0.7f, 0.7f, 1.f);
         glClear(GL_COLOR_BUFFER_BIT);
         LGL_ERROR;
 
-        if (_textures.empty()) {
-            return;
-        }
-
         // update layout dimensions
         _numTiles.x = ceil(sqrt(static_cast<float>(_textures.size())));
         _numTiles.y = ceil(static_cast<float>(_textures.size()) / _numTiles.x);

core/datastructures/imagerepresentationconversioncore.cpp

@@ -46,6 +46,7 @@ namespace campvis {
                 return nullptr;
             }
 
+            OpenGLJobProcessor::ScopedSynchronousGlJobExecution jobGuard;
             ImageRepresentationGL* toReturn = ImageRepresentationGL::create(const_cast<ImageData*>(tester->getParent()), wtp);
 
             switch (wtp._baseType) {
@@ -78,6 +79,7 @@ namespace campvis {
             return toReturn;
         }
         else if (const ImageRepresentationLocal* tester = dynamic_cast<const ImageRepresentationLocal*>(source)) {
+            OpenGLJobProcessor::ScopedSynchronousGlJobExecution jobGuard;
             ImageRepresentationGL* toReturn = ImageRepresentationGL::create(const_cast<ImageData*>(tester->getParent()), tester->getWeaklyTypedPointer());
             return toReturn;
         }