[Bf-blender-cvs] [f1f42c6] master: Fix compilation error after recent luma changes on certain platforms

Sergey Sharybin noreply at git.blender.org
Tue Jan 26 09:58:49 CET 2016


Commit: f1f42c6172c7e656f42cb4895c0badf10f33a1ad
Author: Sergey Sharybin
Date:   Tue Jan 26 09:57:25 2016 +0100
Branches: master
https://developer.blender.org/rBf1f42c6172c7e656f42cb4895c0badf10f33a1ad

Fix compilation error after recent luma changes on certain platforms

See T47243 for some more details.

===================================================================

M	source/blender/imbuf/intern/openexr/openexr_api.cpp

===================================================================

diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index ecef621..40b5a1a 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -71,9 +71,6 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "IMB_allocimbuf.h"
 #include "IMB_metadata.h"
 
-#include "IMB_colormanagement.h"
-#include "IMB_colormanagement_intern.h"
-
 #include "openexr_multi.h"
 }
 
@@ -104,6 +101,11 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include <ImfPartType.h>
 #include <ImfPartHelper.h>
 
+extern "C" {
+#include "IMB_colormanagement.h"
+#include "IMB_colormanagement_intern.h"
+}
+
 using namespace Imf;
 using namespace Imath;




More information about the Bf-blender-cvs mailing list