EffectInstance: check if render is aborted before rendering

MrKepzie · Oct 26, 2016 · e1f2416 · e1f2416
1 parent 0716821
commit e1f2416
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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() ) {