Commit: 863352dfdc1bbe30a452e1e006123fbaea3d401f
Author: Campbell Barton
Date: Wed Apr 30 10:43:46 2014 +1000
https://developer.blender.org/rB863352dfdc1bbe30a452e1e006123fbaea3d401f
Correct issue with IMB_ispic returning bool
===================================================================
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/util.c
===================================================================
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 47f1864..6e21db0 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -355,6 +355,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *filepath,
int flags);
* \attention Defined in util.c
*/
bool IMB_ispic(const char *name);
+int IMB_ispic_type(const char *name);
/**
*
diff --git a/source/blender/imbuf/intern/util.c
b/source/blender/imbuf/intern/util.c
index 36f8367..052059e 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -183,7 +183,7 @@ const char *imb_ext_audio[] = {
NULL
};
-bool IMB_ispic(const char *name)
+int IMB_ispic_type(const char *name)
{
/* increased from 32 to 64 because of the bitmaps header size */
#define HEADER_SIZE 64
@@ -228,11 +228,15 @@ bool IMB_ispic(const char *name)
}
}
- return false;
+ return 0;
#undef HEADER_SIZE
}
+bool IMB_ispic(const char *name)
+{
+ return (IMB_ispic_type(name) != 0);
+}
static int isavi(const char *name)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
