[Bf-blender-cvs] [60460db] cycles-ptex-49: Add Ptex extension (ptx) to imb_ext_image array
Nicholas Bishop
noreply at git.blender.org
Mon Feb 9 00:48:55 CET 2015
Commit: 60460db606574c1349a80b53cc13a31f87678050
Author: Nicholas Bishop
Date: Mon Feb 9 00:20:15 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB60460db606574c1349a80b53cc13a31f87678050
Add Ptex extension (ptx) to imb_ext_image array
Also hid ptx extension behind WITH_PTEX ifdefs
===================================================================
M source/blender/imbuf/intern/util.c
===================================================================
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 848d572..7c9abfa 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -97,6 +97,9 @@ const char *imb_ext_image[] = {
#ifdef WITH_OPENIMAGEIO
".psd", ".pdd", ".psb",
#endif
+#ifdef WITH_PTEX
+ ".ptx",
+#endif
NULL
};
@@ -104,8 +107,9 @@ const char *imb_ext_image_filepath_only[] = {
#ifdef WITH_OPENIMAGEIO
".psd", ".pdd", ".psb",
#endif
- // TODO
+#ifdef WITH_PTEX
".ptx",
+#endif
NULL
};
More information about the Bf-blender-cvs
mailing list