archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source 
remove use of blendertimer.h
This commit is contained in:
Daniel Dunbar
2003-03-24 16:37:08 +00:00
parent 40ff08a34e
commit 702880df55
12 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/radiosity/intern/source/radfactors.c
View 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();
}

2
source/blender/render/intern/source/rendercore.c
View 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() */

10
source/blender/renderconverter/intern/convertBlenderScene.c
View 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(); */

3
source/blender/src/drawseq.c
View 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)

1
source/blender/src/edit.c
View File

@@ -90,7 +90,6 @@
#include "BDR_editcurve.h"
/* old stuff */
#include "blendertimer.h"
#include "blendef.h"
#include "interface.h"
#include "mydevice.h"

2
source/blender/src/editaction.c
View File

@@ -89,8 +89,6 @@
#include "BDR_editobject.h"
#include "blendertimer.h"
#include "interface.h"
#include "mydevice.h"
#include "blendef.h"

1
source/blender/src/editnla.c
View File

@@ -80,7 +80,6 @@
#include "interface.h"
#include "blendef.h"
#include "mydevice.h"
#include "blendertimer.h"
#ifdef HAVE_CONFIG_H
#include <config.h>

2
source/blender/src/editview.c
View File

@@ -88,8 +88,6 @@
#include "BSE_drawview.h"
#include "BSE_editaction.h"
#include "blendertimer.h"
#include "blendef.h"
#include "mydevice.h"

2
source/blender/src/interface.c
View File

@@ -75,8 +75,6 @@
#include "BSE_view.h"
#include "blendertimer.h"
#include "mydevice.h"
#include "interface.h"
#include "blendef.h"

4
source/blender/src/renderwin.c
View 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);

1
source/blender/src/toets.c
View 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"