diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-19 22:11:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-19 22:11:02 +0300 |
| commit | 3bda5490f7f50a795cd8b2c3d841c9375723aee9 (patch) | |
| tree | cdcd6b5a08cc8566a0d3c8e8e1518fe990d5826f /source/blender/radiosity | |
| parent | 12ad72ba8f4ab598c558428567707413e208eac7 (diff) | |
2.5: globals cleanup
* G.version removed, use BLENDER_VERSION
* G.order removed, ENDIAN_ORDER
* G.vd, G.sipo, G.buts, G.sima, .. removed.
* G.qual removed
* G.simulf removed (was unused in 2.4x)
* error() and some other unused stubs removed
Diffstat (limited to 'source/blender/radiosity')
| -rw-r--r-- | source/blender/radiosity/extern/include/radio.h | 3 | ||||
| -rw-r--r-- | source/blender/radiosity/intern/source/radpreprocess.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/radiosity/extern/include/radio.h b/source/blender/radiosity/extern/include/radio.h index b50560438fb..847d2fb1ae9 100644 --- a/source/blender/radiosity/extern/include/radio.h +++ b/source/blender/radiosity/extern/include/radio.h @@ -41,6 +41,7 @@ #include "radio_types.h" extern RadGlobal RG; +struct View3D; /* radfactors.c */ extern float calcStokefactor(RPatch *shoot, RPatch *rp, RNode *rn, float *area); @@ -111,7 +112,7 @@ extern void splitconnected(void); extern int vergedge(const void *v1,const void *v2); extern void addedge(float *v1, float *v2, EdSort *es); extern void setedgepointers(void); -extern void rad_collect_meshes(void); +extern void rad_collect_meshes(struct View3D *v3d); extern void countelem(RNode *rn); extern void countglobaldata(void); extern void addelem(RNode ***el, RNode *rn, RPatch *rp); diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c index eec75942da0..30d2e000bb7 100644 --- a/source/blender/radiosity/intern/source/radpreprocess.c +++ b/source/blender/radiosity/intern/source/radpreprocess.c @@ -293,7 +293,7 @@ static int materialIndex(Material *ma) return -1; } -void rad_collect_meshes() +void rad_collect_meshes(View3D *v3d) { extern Material defmaterial; Base *base; @@ -309,7 +309,7 @@ void rad_collect_meshes() float *vd, *v1, *v2, *v3, *v4 = NULL; int a, b, offs, index, mfdatatot; - if (G.vd==NULL) { + if (v3d==NULL) { printf("Error, trying to collect radiosity meshes with no 3d view\n"); return; } @@ -330,7 +330,7 @@ void rad_collect_meshes() RG.totface= 0; base= (G.scene->base.first); while(base) { - if(((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) { + if(((base)->flag & SELECT) && ((base)->lay & v3d->lay) ) { if(base->object->type==OB_MESH) { base->flag |= OB_RADIO; me= base->object->data; @@ -353,7 +353,7 @@ void rad_collect_meshes() /* min-max and material array */ base= (G.scene->base.first); while(base) { - if( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) { + if( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) ) { if(base->object->type==OB_MESH) { me= base->object->data; mvert= me->mvert; @@ -420,7 +420,7 @@ void rad_collect_meshes() base= (G.scene->base.first); while(base) { - if( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) { + if( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) ) { if(base->object->type==OB_MESH) { ob= base->object; me= ob->data; |