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.
This commit is contained in:
Tamito Kajiyama
2010-02-13 11:37:34 +00:00
parent 135a944c66
commit f022cc4f90
2 changed files with 9 additions and 1 deletions

View File

@@ -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 ) {

View File

@@ -1877,7 +1877,8 @@ static void do_render_3d(Render *re)
/* Freestyle */
if( re->r.mode & R_EDGE_FRS && re->r.renderer==R_INTERN)
FRS_add_Freestyle(re);
if(!re->test_break(re->tbh))
FRS_add_Freestyle(re);
/* free all render verts etc */
RE_Database_Free(re);