From 827f34124d881008205f7f2579779eee5685996a Mon Sep 17 00:00:00 2001 From: shun-iwasawa <shun-iwasawa@users.noreply.github.com> Date: Mar 08 2017 03:33:35 +0000 Subject: fix preview fx (#1073) close #1072 --- diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index 0e0e647..9f4c5fc 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -994,8 +994,13 @@ void PreviewFxRenderPort::onRenderRasterStarted( void PreviewFxRenderPort::onRenderRasterCompleted( const RenderData &renderData) { - /*-- 計算の途中でキャンセルされた場合、結果を出さない --*/ - if (renderData.m_info.m_isCanceled && *renderData.m_info.m_isCanceled) return; + /*-- Do not show the result if canceled while rendering --*/ + if (renderData.m_info.m_isCanceled && *renderData.m_info.m_isCanceled) { + // set m_renderFailed to true in order to prevent updating + // m_overallRenderedRegion at PreviewFxInstance::onRenderFinished(). + m_owner->m_renderFailed = true; + return; + } m_owner->onRenderRasterCompleted(renderData); }