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>2016-01-26 11:57:25 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-26 11:57:25 +0300
commitf1f42c6172c7e656f42cb4895c0badf10f33a1ad (patch)
tree23fa82fc86708afde85d147767ce1540f5e0ac11 /source/blender/imbuf/intern/openexr/openexr_api.cpp
parentb336124a136774d7aae6e0ecd6ce445f81254a69 (diff)
Fix compilation error after recent luma changes on certain platforms
See T47243 for some more details.
Diffstat (limited to 'source/blender/imbuf/intern/openexr/openexr_api.cpp')
-rw-r--r--source/blender/imbuf/intern/openexr/openexr_api.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index ecef621b510..40b5a1a914c 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;