[Bf-blender-cvs] [ba6ddf9e9e5] tmp-gpu-context-isolation: Cleanup: OCIO: Remove extern "C" around blender headers
Clément Foucault
noreply at git.blender.org
Fri Jul 31 18:58:25 CEST 2020
Commit: ba6ddf9e9e5f8c9afb7339134bcdc514bdcced88
Author: Clément Foucault
Date: Thu Jul 30 19:48:05 2020 +0200
Branches: tmp-gpu-context-isolation
https://developer.blender.org/rBba6ddf9e9e5f8c9afb7339134bcdc514bdcced88
Cleanup: OCIO: Remove extern "C" around blender headers
===================================================================
M intern/opencolorio/ocio_impl_glsl.cc
===================================================================
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index ab81227ff1a..f766f57732a 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -45,10 +45,8 @@
# pragma warning(pop)
#endif
-extern "C" {
#include "GPU_immediate.h"
#include "GPU_shader.h"
-}
using namespace OCIO_NAMESPACE;
More information about the Bf-blender-cvs
mailing list