Update things to use blender_test_break() vs MISC_test_break() and

remove use of blendertimer.h

8 files changed, 1 insertions, 15 deletions

diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 63907ec2c9e..e23588ba1ef 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -71,9 +71,6 @@
 #include "BSE_drawipo.h"
 #include "BSE_sequence.h"
 
-/* Modules used */
-#include "blendertimer.h" /* timer functions */
-
 int no_rightbox=0, no_leftbox= 0;
 
 static void EmbossBoxf(float x1, float y1, float x2, float y2, int sel, unsigned int dark, unsigned int light)
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index eaeba18879d..34106630726 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -90,7 +90,6 @@
 #include "BDR_editcurve.h"
 
 /* old stuff */
-#include "blendertimer.h"
 #include "blendef.h"
 #include "interface.h"
 #include "mydevice.h"
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 63b42531f67..eef5fb3d6b4 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -89,8 +89,6 @@
 
 #include "BDR_editobject.h"
 
-#include "blendertimer.h"
-
 #include "interface.h"
 #include "mydevice.h"
 #include "blendef.h"
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index c74fb7892f6..fab417ce29e 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -80,7 +80,6 @@
 #include "interface.h"
 #include "blendef.h"
 #include "mydevice.h"
-#include "blendertimer.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 0a902d4b1a4..e3ab75bf9fe 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -88,8 +88,6 @@
 #include "BSE_drawview.h"
 #include "BSE_editaction.h"
 
-#include "blendertimer.h"
-
 #include "blendef.h"
 #include "mydevice.h"
 
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 55605e9154e..06fa41b6946 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -75,8 +75,6 @@
 
 #include "BSE_view.h"
 
-#include "blendertimer.h"
-
 #include "mydevice.h"
 #include "interface.h"
 #include "blendef.h"
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index b344c748344..9103278049b 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -70,8 +70,6 @@
 #include "BSE_filesel.h"
 #include "BSE_headerbuttons.h"
 
-#include "blendertimer.h"
-
 #include "blendef.h"
 #include "mydevice.h"
 #include "winlay.h"
@@ -598,7 +596,7 @@ static void renderview_progress_display_cb(int y1, int y2, int w, int h, unsigne
 static int test_break(void)
 {
 	if (!G.afbreek) {
-		if (MISC_test_break()) {
+		if (blender_test_break()) {
 			;
 		} else if (render_win) {
 			winlay_process_events(0);
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 7a683ed9bfc..35cfea9d0a2 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -92,7 +92,6 @@
 #include "blendef.h"
 #include "interface.h"
 #include "render.h"
-#include "blendertimer.h" /* timer functions */
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"