diff options
author | Ton Roosendaal <ton@blender.org> | 2003-06-14 18:49:12 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2003-06-14 18:49:12 +0400 |
commit | 6dc3b9107c7abd0ef28360f2a733924c69c6098a (patch) | |
tree | 51dd0baacb87c30b660be03ec7ce7bbadcf83968 /source/blender/src/renderwin.c | |
parent | 7a096b46648f4e9a50c1a90affe72ac7d4631606 (diff) |
- removed test_break call from #ifdef POSIX part, to prevent double
it now is a cross platform function again.
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r-- | source/blender/src/renderwin.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 7acc31c144a..a09d875e384 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -635,7 +635,7 @@ static void printrenderinfo_cb(double time, int sample) /* -------------- callback system to allow ESC from rendering ----------------------- */ -/* WIN32: this function is called all the time, and should not use cpu or resources */ +/* POSIX & WIN32: this function is called all the time, and should not use cpu or resources */ static int test_break() { @@ -657,6 +657,8 @@ static int test_break() else return 0; } + + #ifdef _WIN32 /* we use the multimedia time here */ static UINT uRenderTimerId; @@ -683,29 +685,6 @@ static void end_test_break_callback() #else /* all other OS's support signal(SIGVTALRM) */ -/* POSIX: this function is called all the time, and should not use cpu or resources */ -static int test_break() -{ - short val; - - if(G.afbreek==2) { /* code for testing queue */ - - G.afbreek= 0; - - blender_test_break(); /* tests blender interface */ - - if (G.afbreek==0 && render_win) { /* tests window */ - winlay_process_events(0); - // render_win can be closed in winlay_process_events() - if (render_win == 0 || (render_win->flags & RW_FLAGS_ESCAPE)) - G.afbreek= 1; - } - } - - if(G.afbreek==1) return 1; - else return 0; -} - /* POSIX: this function goes in the signal() callback */ static void interruptESC(int sig) { |