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-26 17:21:10 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-09-26 17:21:10 +0400
commitc9d4956f45a5362fcc933f319acee705563feaac (patch)
treead73cd0b48570fe684c1f4a12c149be30589913a /intern/opencolorio
parentfae7dd22c77bae06af4082aaac205a9a3e46014c (diff)
Color Management: restore abort() in cases of error and WITH_ASSERT_ABORT enabled
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_capi.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/ocio_capi.cpp b/intern/opencolorio/ocio_capi.cpp
index cc45eb9b2dd..152b537ab9b 100644
--- a/intern/opencolorio/ocio_capi.cpp
+++ b/intern/opencolorio/ocio_capi.cpp
@@ -35,7 +35,7 @@
#define OCIO_CAPI_IMPLEMENTATION
#include "ocio_capi.h"
-#ifdef NDEBUG
+#if !defined(WITH_ASSERT_ABORT)
# define OCIO_abort()
#else
# include <stdlib.h>
@@ -53,7 +53,7 @@ static void OCIO_reportError(const char *err)
{
std::cerr << "OpenColorIO Error: " << err << std::endl;
- // OCIO_abort();
+ OCIO_abort();
}
static void OCIO_reportException(Exception &exception)