diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-13 14:37:34 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-13 14:37:34 +0300 |
| commit | f022cc4f90a398a6bc59cf6dfb2a3c9ee6cffb9a (patch) | |
| tree | 0e647205bd391bafd58300d87a0dd71b4a7e3521 /source/blender/freestyle | |
| parent | 135a944c66c57f11fd77b4f7231686353112e7ac (diff) | |
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.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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 ) { |