diff --git a/rendering/renderfunctions.cpp b/rendering/renderfunctions.cpp index 55f534e59..dcac906b5 100644 --- a/rendering/renderfunctions.cpp +++ b/rendering/renderfunctions.cpp @@ -375,7 +375,7 @@ GLuint compose_sequence(ComposeSequenceParams ¶ms) { #ifndef NO_OCIO // convert to linear colorspace - if (olive::CurrentConfig.enable_color_management) + if (olive::CurrentConfig.enable_color_management && params.ocio_shader != nullptr) { params.ocio_shader->bind(); diff --git a/rendering/renderthread.cpp b/rendering/renderthread.cpp index ddb533568..586b85d6f 100644 --- a/rendering/renderthread.cpp +++ b/rendering/renderthread.cpp @@ -215,7 +215,15 @@ void RenderThread::set_up_ocio() // GET OCIO PROCESSOR // - OCIO::ConstProcessorRcPtr processor = OCIO::GetCurrentConfig()->getProcessor(transform); + OCIO::ConstProcessorRcPtr processor; + try { + processor = OCIO::GetCurrentConfig()->getProcessor(transform); + } catch(OCIO::Exception & e) { + qCritical() << e.what(); + ctx->functions()->glActiveTexture(GL_TEXTURE0); + return; + } + // // SET UP GLSL SHADER