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/render | |
| 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/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_render_ext.h | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index e61de5bc3e6..08df53221c8 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -35,7 +35,9 @@ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* called by meshtools */ -void RE_make_sticky(void); +struct View3D; + +void RE_make_sticky(struct View3D *v3d); /* for radiosity module */ struct RadView; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e2692113d16..e24748fecff 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5512,7 +5512,7 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob) /* Sticky texture coords */ /* ------------------------------------------------------------------------- */ -void RE_make_sticky(void) +void RE_make_sticky(View3D *v3d) { Object *ob; Base *base; @@ -5523,7 +5523,7 @@ void RE_make_sticky(void) float ho[4], mat[4][4]; int a; - if(G.vd==NULL) { + if(v3d==NULL) { printf("Need a 3d view to make sticky\n"); return; } @@ -5549,7 +5549,7 @@ void RE_make_sticky(void) RE_SetView(re, mat); for(base= FIRSTBASE; base; base= base->next) { - if TESTBASELIB(base) { + if TESTBASELIB(v3d, base) { if(base->object->type==OB_MESH) { ob= base->object; |