[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26862] branches/soc-2008-mxcurioni/source /blender: Added changes for escaping from rendering by pressing the ESC key .

[Tamito Kajiyama]

Revision: 26862
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26862
Author:   kjym3
Date:     2010-02-13 12:37:34 +0100 (Sat, 13 Feb 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2010-02-13 10:55:04 UTC (rev 26861)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2010-02-13 11:37:34 UTC (rev 26862)
@@ -123,6 +123,8 @@
 		// 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 @@
 				//   - compute view map
 				prepare(re, srl);
 
+                if( re->test_break(re->tbh) ) {
+					controller->CloseFile();
+                    break;
+                }
+
 				// render and composite Freestyle result
 				if( controller->_ViewMap ) {
 					

Modified: branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c	2010-02-13 10:55:04 UTC (rev 26861)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c	2010-02-13 11:37:34 UTC (rev 26862)
@@ -1877,7 +1877,8 @@
 	
 	/* 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);