Game Player links again, added new functions in the stubs
authorTon Roosendaal <ton@blender.org>
Wed, 20 Dec 2006 21:51:08 +0000 (21:51 +0000)
committerTon Roosendaal <ton@blender.org>
Wed, 20 Dec 2006 21:51:08 +0000 (21:51 +0000)
(image.c: prototype fix)

source/blender/blenkernel/bad_level_call_stubs/stubs.c
source/blender/blenkernel/intern/image.c

index cf9fc19efbf713b57fa0af6f0322c7118aa1127b..8514a6b8c648665b543551ca1d4acfeadc0340a2 100644 (file)
@@ -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;}
index b8a6ebf8928b4f7f808c88b2fbce21564402e22b..3d875c05c5ba2ab60e71f8cd0dd1958ffb09f06b 100644 (file)
@@ -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 */