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>2012-09-16 19:17:22 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-09-16 19:17:22 +0400
commitfc7de2353763c65db3c04c29dcc33289bb86966d (patch)
tree3651a4c2f3c32622ea0eaff3f60264ed6ac1bb73 /intern/opencolorio
parenteacf3054aa7479f98d87b8bdc757fd72d68d1610 (diff)
Color Management: fix crash when displaying render preview if OCIO was disabled buildtime
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_capi.cpp5
-rw-r--r--intern/opencolorio/ocio_capi.h1
-rw-r--r--intern/opencolorio/ocio_capi_stub.cpp5
3 files changed, 11 insertions, 0 deletions
diff --git a/intern/opencolorio/ocio_capi.cpp b/intern/opencolorio/ocio_capi.cpp
index ec8012cc30f..d67cea61836 100644
--- a/intern/opencolorio/ocio_capi.cpp
+++ b/intern/opencolorio/ocio_capi.cpp
@@ -78,6 +78,11 @@ ConstConfigRcPtr *OCIO_getCurrentConfig(void)
return NULL;
}
+ConstConfigRcPtr *OCIO_getDefaultConfig(void)
+{
+ return NULL;
+}
+
void OCIO_setCurrentConfig(const ConstConfigRcPtr *config)
{
try {
diff --git a/intern/opencolorio/ocio_capi.h b/intern/opencolorio/ocio_capi.h
index f0edd25ac14..e774e3e8548 100644
--- a/intern/opencolorio/ocio_capi.h
+++ b/intern/opencolorio/ocio_capi.h
@@ -59,6 +59,7 @@ extern "C" {
ConstConfigRcPtr *OCIO_getCurrentConfig(void);
+ConstConfigRcPtr *OCIO_getDefaultConfig(void);
void OCIO_setCurrentConfig(const ConstConfigRcPtr *config);
ConstConfigRcPtr *OCIO_configCreateFromEnv(void);
diff --git a/intern/opencolorio/ocio_capi_stub.cpp b/intern/opencolorio/ocio_capi_stub.cpp
index a601cd3be91..f910d1a34cf 100644
--- a/intern/opencolorio/ocio_capi_stub.cpp
+++ b/intern/opencolorio/ocio_capi_stub.cpp
@@ -56,6 +56,11 @@ ConstConfigRcPtr *OCIO_getCurrentConfig(void)
return CONFIG_DEFAULT;
}
+ConstConfigRcPtr *OCIO_getDefaultConfig(void)
+{
+ return CONFIG_DEFAULT;
+}
+
void OCIO_setCurrentConfig(const ConstConfigRcPtr *)
{
}