diff options
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 7 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
2 files changed, 9 insertions, 1 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 ) { diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 72b147e9927..a5b3b1dd18c 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -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); |