Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-12-08 13:03:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-12-08 13:03:17 +0400
commit46f8dba4c783fe5d174bd47a70710f9d7f0aeb07 (patch)
tree7998b9664bb00612501243ca20c0c9ddc7b5a0e9 /source/blender/imbuf/intern/oiio
parent55416f435ab9043df13b23e3e5244003d05d69bf (diff)
Extend system-info with information about OIIO, OCIO and OSL
Summary: Version of those libraries might be useful to know. - OIIO and OCIO is exposed via bpy.app.oiio and bpy.app.ocio. There're "supported", "version" and "version_string" defined in those modules. - OSL is available as _cycles.osl_version and _cycles.osl_version_string. Reviewers: campbellbarton Reviewed By: campbellbarton CC: dingto Differential Revision: http://developer.blender.org/D79
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
-rw-r--r--source/blender/imbuf/intern/oiio/openimageio_api.cpp5
-rw-r--r--source/blender/imbuf/intern/oiio/openimageio_api.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
index fe74b8f7cce..ec9c8fdbb4d 100644
--- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
+++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
@@ -275,6 +275,11 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac
}
}
+int OIIO_getVersionHex(void)
+{
+ return openimageio_version();
+}
+
} // export "C"
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.h b/source/blender/imbuf/intern/oiio/openimageio_api.h
index ad11f4bcfe3..df1122584bd 100644
--- a/source/blender/imbuf/intern/oiio/openimageio_api.h
+++ b/source/blender/imbuf/intern/oiio/openimageio_api.h
@@ -39,12 +39,16 @@ extern "C" {
#include <stdio.h>
+struct ImBuf;
+
int imb_is_a_photoshop (const char *name);
int imb_save_photoshop (struct ImBuf *ibuf, const char *name, int flags);
struct ImBuf *imb_load_photoshop (const char *name, int flags, char *colorspace);
+int OIIO_getVersionHex(void);
+
#ifdef __cplusplus
}