From f022cc4f90a398a6bc59cf6dfb2a3c9ee6cffb9a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 13 Feb 2010 11:37:34 +0000 Subject: Added changes for escaping from rendering by pressing the ESC key. ESC key press checks are performed 1) before entering Freestyle, and 2) after the completion of the view map creation. --- .../blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 97d4fd6c548..9b4f128ff3d 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -123,6 +123,8 @@ extern "C" { // load mesh if( controller->LoadMesh(re, srl) ) // returns if scene cannot be loaded or if empty return; + if( re->test_break(re->tbh) ) + return; // add style modules FreestyleConfig* config = &srl->freestyleConfig; @@ -234,6 +236,11 @@ extern "C" { // - compute view map prepare(re, srl); + if( re->test_break(re->tbh) ) { + controller->CloseFile(); + break; + } + // render and composite Freestyle result if( controller->_ViewMap ) { -- cgit v1.2.3