diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
| commit | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (patch) | |
| tree | 8b232d5867b47e7364aa6d1db1c2a519096ec507 /source/blender/imbuf | |
| parent | e7a33d8bf4c736efe7e99fe780b3664543c365a0 (diff) | |
| parent | 86c828d9fdf6df9f392f70d8ed1f0e10ce10e098 (diff) | |
Merge branch 'master' into temp-ghash-experiments
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/bmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index bc5ad96f151..19e655a0b3d 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -143,7 +143,7 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags, char co mem += BMP_FILEHEADER_SIZE; } else { - return 0; + return NULL; } /* for systems where an int needs to be 4 bytes aligned */ |