diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-25 23:34:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-25 23:34:38 +0400 |
| commit | 88097e99099b8bea9c9e435d7c728afaa8bc24ff (patch) | |
| tree | 4e13f1483141d020b8e02ad6ed91502e0c153d38 /source/blender/imbuf | |
| parent | 431a388ae72bc21eff47ed616913e30920a2ce47 (diff) | |
- BGE Python API converting a mesh from a python arg was broken but happened to work if the uninitialized pointer was not NULL.
- iris.c - looks like a copy/paste error, was using rect where it could not have been initialized.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/iris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index eba148cb8a5..7b8c383ddb9 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -245,7 +245,6 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) int xsize, ysize, zsize; int bpp, rle, cur, badorder; ImBuf * ibuf; - uchar * rect; /*printf("new iris\n");*/ @@ -436,6 +435,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) if (bpp == 1) { + uchar * rect; if (image.zsize == 1){ rect = (uchar *) ibuf->rect; @@ -467,7 +467,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) fbase = ibuf->rect_float; for (x = ibuf->x * ibuf->y; x > 0; x--) { fbase[0] = 1; - fbase[1] = rect[2] = rect[3]; + fbase[1] = fbase[2] = fbase[3]; fbase += 4; } } else if (image.zsize == 2){ |