From e1f2416045422e38e8aa8febe15eb24b938289fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Wed, 26 Oct 2016 17:57:28 +0200 Subject: [PATCH] EffectInstance: check if render is aborted before rendering --- Engine/EffectInstanceRenderRoI.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Engine/EffectInstanceRenderRoI.cpp b/Engine/EffectInstanceRenderRoI.cpp index 390faea8e8..54230068ee 100644 --- a/Engine/EffectInstanceRenderRoI.cpp +++ b/Engine/EffectInstanceRenderRoI.cpp @@ -1536,9 +1536,8 @@ EffectInstance::renderRoI(const RenderRoIArgs & args, EffectInstance::RenderRoIStatusEnum renderRetCode = eRenderRoIStatusImageAlreadyRendered; bool renderAborted; - if (!hasSomethingToRender && !planesToRender->isBeingRenderedElsewhere) { - renderAborted = aborted(); - } else { + renderAborted = aborted(); + if (!renderAborted && (hasSomethingToRender || planesToRender->isBeingRenderedElsewhere) ) { #if NATRON_ENABLE_TRIMAP ///Only use trimap system if the render cannot be aborted. if ( frameArgs->isCurrentFrameRenderNotAbortable() ) {