From 46f8dba4c783fe5d174bd47a70710f9d7f0aeb07 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Sun, 8 Dec 2013 15:03:17 +0600
Subject: 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
---
 intern/opencolorio/fallback_impl.cc | 10 ++++++++++
 intern/opencolorio/ocio_capi.cc     | 10 ++++++++++
 intern/opencolorio/ocio_capi.h      |  3 +++
 intern/opencolorio/ocio_impl.cc     | 10 ++++++++++
 intern/opencolorio/ocio_impl.h      |  9 +++++++++
 5 files changed, 42 insertions(+)

(limited to 'intern/opencolorio')

diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index ca999eab569..6383bbbb07f 100644
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -431,3 +431,13 @@ void FallbackImpl::finishGLSLDraw(OCIO_GLSLDrawState * /*state*/)
 void FallbackImpl::freeGLState(struct OCIO_GLSLDrawState * /*state_r*/)
 {
 }
+
+const char *FallbackImpl::getVersionString(void)
+{
+	return "fallback";
+}
+
+int FallbackImpl::getVersionHex(void)
+{
+	return 0;
+}
diff --git a/intern/opencolorio/ocio_capi.cc b/intern/opencolorio/ocio_capi.cc
index 30668dff245..47ee3afddfd 100644
--- a/intern/opencolorio/ocio_capi.cc
+++ b/intern/opencolorio/ocio_capi.cc
@@ -338,3 +338,13 @@ void OCIO_freeOGLState(struct OCIO_GLSLDrawState *state)
 {
 	impl->freeGLState(state);
 }
+
+const char *OCIO_getVersionString(void)
+{
+	return impl->getVersionString();
+}
+
+int OCIO_getVersionHex(void)
+{
+	return impl->getVersionHex();
+}
diff --git a/intern/opencolorio/ocio_capi.h b/intern/opencolorio/ocio_capi.h
index 5532ade1f3a..5abe104fcd4 100644
--- a/intern/opencolorio/ocio_capi.h
+++ b/intern/opencolorio/ocio_capi.h
@@ -193,6 +193,9 @@ int OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorR
 void OCIO_finishGLSLDraw(struct OCIO_GLSLDrawState *state);
 void OCIO_freeOGLState(struct OCIO_GLSLDrawState *state);
 
+const char *OCIO_getVersionString(void);
+int OCIO_getVersionHex(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index 2cffe1a89ef..663ca2d1c75 100644
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -609,3 +609,13 @@ void OCIOImpl::matrixTransformScale(float *m44, float *offset4, const float *sca
 {
 	MatrixTransform::Scale(m44, offset4, scale4f);
 }
+
+const char *OCIOImpl::getVersionString(void)
+{
+	return GetVersion();
+}
+
+int OCIOImpl::getVersionHex(void)
+{
+	return GetVersionHex();
+}
diff --git a/intern/opencolorio/ocio_impl.h b/intern/opencolorio/ocio_impl.h
index 8b666e8ae14..4e7c1bcc832 100644
--- a/intern/opencolorio/ocio_impl.h
+++ b/intern/opencolorio/ocio_impl.h
@@ -110,6 +110,9 @@ public:
 	                           OCIO_CurveMappingSettings *curve_mapping_settings, bool predivide) = 0;
 	virtual void finishGLSLDraw(struct OCIO_GLSLDrawState *state) = 0;
 	virtual void freeGLState(struct OCIO_GLSLDrawState *state_r) = 0;
+
+	virtual const char *getVersionString(void) = 0;
+	virtual int getVersionHex(void) = 0;
 };
 
 class FallbackImpl : public IOCIOImpl {
@@ -194,6 +197,9 @@ public:
 	                   OCIO_CurveMappingSettings *curve_mapping_settings, bool predivide);
 	void finishGLSLDraw(struct OCIO_GLSLDrawState *state);
 	void freeGLState(struct OCIO_GLSLDrawState *state_r);
+
+	const char *getVersionString(void);
+	int getVersionHex(void);
 };
 
 #ifdef WITH_OCIO
@@ -279,6 +285,9 @@ public:
 	                   OCIO_CurveMappingSettings *curve_mapping_settings, bool predivide);
 	void finishGLSLDraw(struct OCIO_GLSLDrawState *state);
 	void freeGLState(struct OCIO_GLSLDrawState *state_r);
+
+	const char *getVersionString(void);
+	int getVersionHex(void);
 };
 #endif
 
-- 
cgit v1.2.3