[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50909] trunk/blender/intern/opencolorio/ ocio_capi.cpp: Color Management: restore abort() in cases of error and WITH_ASSERT_ABORT enabled

[Sergey Sharybin]

Revision: 50909
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50909
Author:   nazgul
Date:     2012-09-26 13:21:10 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Color Management: restore abort() in cases of error and WITH_ASSERT_ABORT enabled

Modified Paths:
--------------
    trunk/blender/intern/opencolorio/ocio_capi.cpp

Modified: trunk/blender/intern/opencolorio/ocio_capi.cpp
===================================================================
--- trunk/blender/intern/opencolorio/ocio_capi.cpp	2012-09-26 13:17:47 UTC (rev 50908)
+++ trunk/blender/intern/opencolorio/ocio_capi.cpp	2012-09-26 13:21:10 UTC (rev 50909)
@@ -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 @@
 {
 	std::cerr << "OpenColorIO Error: " << err << std::endl;
 
-	// OCIO_abort();
+	OCIO_abort();
 }
 
 static void OCIO_reportException(Exception &exception)