Update things to use blender_test_break() vs MISC_test_break() and
authorDaniel Dunbar <daniel@zuster.org>
Mon, 24 Mar 2003 16:37:08 +0000 (16:37 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Mon, 24 Mar 2003 16:37:08 +0000 (16:37 +0000)
remove use of blendertimer.h

12 files changed:
source/blender/radiosity/intern/source/radfactors.c
source/blender/render/intern/source/rendercore.c
source/blender/renderconverter/intern/convertBlenderScene.c
source/blender/src/drawseq.c
source/blender/src/edit.c
source/blender/src/editaction.c
source/blender/src/editnla.c
source/blender/src/editview.c
source/blender/src/interface.c
source/blender/src/renderwin.c
source/blender/src/toets.c
source/creator/creator.c

index 9ea47a9a298d235b28a5df073c8e28eb0673111f..1111593de5bb544538fed5565da6b81ac41b3b9a 100644 (file)
@@ -54,7 +54,6 @@
 
 #include "radio.h"
 #include "render.h"       /* for `RE_zbufferall_radio and RE_zbufferall_radio */
-#include "blendertimer.h" /* timer functions */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -562,7 +561,7 @@ void progressiverad()
                
                clear_backface_test();
                
-               if(MISC_test_break()) break;
+               if(blender_test_break()) break;
                if(RG.maxiter && RG.maxiter<=it) break;
 
                shoot=findshootpatch();
@@ -728,7 +727,7 @@ void subdivideshootElements(int it)
                        }
                        else a--;
                        
-                       if(MISC_test_break()) break;
+                       if(blender_test_break()) break;
                }
                
                /* test op extreem weinig kleurverloop binnen patch met subdivflag */
@@ -799,7 +798,7 @@ void subdivideshootElements(int it)
                }
                makeGlobalElemArray();
 
-               if(contin==0 || MISC_test_break()) break;
+               if(contin==0 || blender_test_break()) break;
        }
        
        make_node_display();
@@ -884,7 +883,7 @@ void subdivideshootPatches(int it)
                                
                                setnodeflags(shoot->first, RAD_SHOOT, 0);
                                
-                               if(MISC_test_break()) break;
+                               if(blender_test_break()) break;
                        }
                        else a--;
                        
@@ -911,7 +910,7 @@ void subdivideshootPatches(int it)
                converttopatches();
                makeGlobalElemArray();
 
-               if(contin==0 || MISC_test_break()) break;
+               if(contin==0 || blender_test_break()) break;
        }
        make_node_display();
 }
index edbb286cdc7e72fef14b04cf5106a66426631d50..00ce238398d2a64c72cb6e68668c343e19363877 100644 (file)
@@ -2731,7 +2731,7 @@ void zbufshade(void)
        
        if(R.r.mode & R_EDGE) edge_enhance();
 
-       /* if((R.flag & R_HALO) && MISC_test_break()==0) halovert(); */
+       /* if((R.flag & R_HALO) && blender_test_break()==0) halovert(); */
 
 } /* end of void zbufshade() */
 
index 4e9a373ca1b4bb00bc6970a753d0cf775d31b3f2..4715ad062388cea88619fef6509be42383a748dc 100644 (file)
@@ -90,9 +90,9 @@
 #include "render.h"
 
 #include "RE_renderconverter.h"
-#include "blendertimer.h" /* MISC_test_break */
 
 #include "BIF_space.h"
+#include "BIF_screen.h"
 #include "BIF_editkey.h"
 
 #include "BSE_sequence.h"
@@ -304,11 +304,11 @@ void RE_make_stars(void (*initfunc)(void),
                                printf("Too many stars\n");
                                break;
                        }
-                       if(MISC_test_break()) break;
+                       if(blender_test_break()) break;
                }
                if(done > MAXVERT) break;
 
-               if(MISC_test_break()) break;
+               if(blender_test_break()) break;
        }
        if (termfunc) termfunc();
 }
@@ -2909,7 +2909,7 @@ void RE_rotateBlenderScene(void)
 
                        ob->flag &= ~OB_DO_IMAT;
                }
-               if(MISC_test_break()) break;
+               if(blender_test_break()) break;
 
                if(base->next==0 && G.scene->set && base==G.scene->base.last) {
                        base= G.scene->set->base.first;
@@ -2938,7 +2938,7 @@ void RE_rotateBlenderScene(void)
 
        slurph_opt= 1;
 
-       if(MISC_test_break()) return;
+       if(blender_test_break()) return;
 
        /* if(R.totlamp==0) defaultlamp(); */
        
index 63907ec2c9e61f6afaf51a0c068c0d84f03d6e29..e23588ba1ef537033d90b84be2d375dca9d5dc77 100644 (file)
@@ -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)
index eaeba18879d76dea35d38878be8b346f9215f99c..34106630726ebe5a0afe7223b39c0c5e851e24a9 100644 (file)
@@ -90,7 +90,6 @@
 #include "BDR_editcurve.h"
 
 /* old stuff */
-#include "blendertimer.h"
 #include "blendef.h"
 #include "interface.h"
 #include "mydevice.h"
index 63b42531f67886c73ca19cb87e03b2a0bd99e308..eef5fb3d6b4cfcf545f9de440464982c8f1119a9 100644 (file)
@@ -89,8 +89,6 @@
 
 #include "BDR_editobject.h"
 
-#include "blendertimer.h"
-
 #include "interface.h"
 #include "mydevice.h"
 #include "blendef.h"
index c74fb7892f62cff2ad2c59a84d8bef2b8ada6453..fab417ce29e31fb0bf4c9f412fd0c231c2a12c45 100644 (file)
@@ -80,7 +80,6 @@
 #include "interface.h"
 #include "blendef.h"
 #include "mydevice.h"
-#include "blendertimer.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
index 0a902d4b1a42f2c764750c796f03912e761eca47..e3ab75bf9fef732690f871d472dc508431c338d0 100644 (file)
@@ -88,8 +88,6 @@
 #include "BSE_drawview.h"
 #include "BSE_editaction.h"
 
-#include "blendertimer.h"
-
 #include "blendef.h"
 #include "mydevice.h"
 
index 55605e9154ee1f05b271756eed8a497b6168ad15..06fa41b6946df5cd199f6e864483a43c30b925a3 100644 (file)
@@ -75,8 +75,6 @@
 
 #include "BSE_view.h"
 
-#include "blendertimer.h"
-
 #include "mydevice.h"
 #include "interface.h"
 #include "blendef.h"
index b344c7483440c603d294bf4edf62bb5a461dce1f..9103278049bb2946cb392af206d4a21573ded0af 100644 (file)
@@ -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);
index 7a683ed9bfc6da5257e11705853844723e2fe1ef..35cfea9d0a2975546d9f9580e0cac2a24d3189e0 100644 (file)
@@ -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"
index 02fdfff857f39a6c822a65779fbd3ea71a562193..c59b37f33b496cc4b16c6afbae5f15ec1dd6acb8 100644 (file)
@@ -77,7 +77,6 @@
 #include "BDR_drawmesh.h"
 
 #include "RE_renderconverter.h"
-#include "blendertimer.h"
 
 #include "playanim_ext.h"
 #include "mydevice.h"
@@ -516,7 +515,7 @@ void setCallbacks(void)
        /* BLI_blenlib: */
        
        BLI_setErrorCallBack(error_cb); /* */
-       BLI_setInterruptCallBack(MISC_test_break);
+       BLI_setInterruptCallBack(blender_test_break);
 
        /* render module: execution flow, timers, cursors and display. */
        RE_set_getrenderdata_callback(RE_rotateBlenderScene);