Better handling of the ESC key during Freestyle rendering.

This commit is meant to improve the response of the ESC key for stopping Freestyle rendering
throughout the rendering process.  The rendering with Freestyle consists of several steps
including: (1) mesh data loading, (2) winged edge construction, (3) silhouette edge detection,
(4) view map construction, and (5) stroke drawing.  All these steps have been extended to
frequently check if the ESC key is pressed, so that users can abort time-consuming rendering
at any point of time.

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index d73a086f81d..2fd6a4a1e8f 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -38,6 +38,7 @@
 # include "../winged_edge/WXEdge.h"
 # include "../winged_edge/Curvature.h"
 # include "../system/ProgressBar.h"
+# include "../system/RenderMonitor.h"
 
 using namespace Geometry;
 
@@ -50,6 +51,7 @@ public:
 
   FEdgeXDetector() {
     _pProgressBar = 0;
+    _pRenderMonitor = 0;
     _computeViewIndependant = true;
     _bbox_diagonal = 1.0;
     _meanEdgeSize = 0;
@@ -165,6 +167,8 @@ public:
 
   inline void setProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
 
+  inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {_pRenderMonitor = iRenderMonitor;}
+
 protected:
 
   Vec3r _Viewpoint;
@@ -193,6 +197,7 @@ protected:
   real _kr_derivative_epsilon;
 
   ProgressBar *_pProgressBar;
+  RenderMonitor *_pRenderMonitor;
 };
 
 #endif // FEDGEDXETECTOR_H