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-10-05 14:05:26 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-10-05 14:05:26 +0400
commit4c3620c69d0c39f288b82327b9c549919bac98ee (patch)
tree762dcefa186e2a22dee6ea4280bcf27963d9b511 /source/blender/imbuf/intern/IMB_colormanagement_intern.h
parent862decfc82a30066ccb8e3da13f6ba8b89fbadff (diff)
Fixed compilation error on widows
Was caused by mixing up own C-API typedefs with OCIO's
Diffstat (limited to 'source/blender/imbuf/intern/IMB_colormanagement_intern.h')
-rw-r--r--source/blender/imbuf/intern/IMB_colormanagement_intern.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
index 35a6ea9b207..ba9e20ac411 100644
--- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h
+++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
@@ -35,7 +35,7 @@
#define BCM_CONFIG_FILE "config.ocio"
-struct ConstProcessorRcPtr;
+struct OCIO_ConstProcessorRcPtr;
struct ImBuf;
typedef struct ColorSpace {
@@ -44,8 +44,8 @@ typedef struct ColorSpace {
char name[64];
char description[64];
- struct ConstProcessorRcPtr *to_scene_linear;
- struct ConstProcessorRcPtr *from_scene_linear;
+ struct OCIO_ConstProcessorRcPtr *to_scene_linear;
+ struct OCIO_ConstProcessorRcPtr *from_scene_linear;
int is_invertible;
int is_data;
@@ -57,8 +57,8 @@ typedef struct ColorManagedDisplay {
char name[64];
ListBase views;
- struct ConstProcessorRcPtr *to_scene_linear;
- struct ConstProcessorRcPtr *from_scene_linear;
+ struct OCIO_ConstProcessorRcPtr *to_scene_linear;
+ struct OCIO_ConstProcessorRcPtr *from_scene_linear;
} ColorManagedDisplay;
typedef struct ColorManagedView {