diff options
author | Ton Roosendaal <ton@blender.org> | 2006-12-21 00:51:08 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-12-21 00:51:08 +0300 |
commit | e6c8702e7b5d90271d654a707b5d00c7b9c981ca (patch) | |
tree | ca5a74676a59756853a264f70307c12e0a4b4954 /source/blender | |
parent | ed853e00da6a984c7a38f07301b7ce6d4cd597f7 (diff) |
Game Player links again, added new functions in the stubs
(image.c: prototype fix)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index cf9fc19efbf..8514a6b8c64 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -229,6 +229,10 @@ void fluidsimSettingsCopy(struct FluidsimSettings* sb) {} /*new render funcs */ int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta) { return 0; } + +void RE_FreeRenderResult(struct RenderResult *rr) {} +void RE_GetResultImage(struct Render *re, struct RenderResult *rr) {} +struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty){return NULL;} struct Render *RE_GetRender(const char *name) {return (struct Render *)NULL;} struct RenderResult *RE_GetResult(Render *re) {return (struct RenderResult *)NULL;} float *RE_RenderLayerGetPass(RenderLayer *rl, int passtype) {return NULL;} diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index b8a6ebf8928..3d875c05c5b 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1293,7 +1293,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser) /* this gives active layer, composite or seqence result */ RE_GetResultImage(RE_GetRender(G.scene->id.name), &rres); - rect= rres.rect32; + rect= (unsigned int *)rres.rect32; rectf= rres.rectf; /* get compo/seq result by default */ |