From 5b53a17bfb1b429b6f7bc74ddda9aa952bd5070d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 11 Mar 2013 11:15:05 +0000 Subject: [PATCH] Colormanagement: Fix issue with colorspaces' description too short, and reduce usage of magic numbers. --- .../blender/imbuf/intern/IMB_colormanagement_intern.h | 11 +++++++---- source/blender/imbuf/intern/colormanagement.c | 1 - source/blender/makesrna/intern/rna_color.c | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h index e2a8e1e3442..c372e125a66 100644 --- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h +++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h @@ -36,11 +36,14 @@ struct OCIO_ConstProcessorRcPtr; struct ImBuf; +#define MAX_COLORSPACE_NAME 64 +#define MAX_COLORSPACE_DESCRIPTION 512 + typedef struct ColorSpace { struct ColorSpace *next, *prev; int index; - char name[64]; - char description[64]; + char name[MAX_COLORSPACE_NAME]; + char description[MAX_COLORSPACE_DESCRIPTION]; struct OCIO_ConstProcessorRcPtr *to_scene_linear; struct OCIO_ConstProcessorRcPtr *from_scene_linear; @@ -52,7 +55,7 @@ typedef struct ColorSpace { typedef struct ColorManagedDisplay { struct ColorManagedDisplay *next, *prev; int index; - char name[64]; + char name[MAX_COLORSPACE_NAME]; ListBase views; struct OCIO_ConstProcessorRcPtr *to_scene_linear; @@ -62,7 +65,7 @@ typedef struct ColorManagedDisplay { typedef struct ColorManagedView { struct ColorManagedView *next, *prev; int index; - char name[64]; + char name[MAX_COLORSPACE_NAME]; } ColorManagedView; /* ** Initialization / De-initialization ** */ diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index c493ecb7b44..10dc517f56a 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -71,7 +71,6 @@ /*********************** Global declarations *************************/ -#define MAX_COLORSPACE_NAME 64 #define DISPLAY_BUFFER_CHANNELS 4 /* ** list of all supported color spaces, displays and views */ diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index cd904bf6c25..74d212fae57 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -993,6 +993,7 @@ static void rna_def_colormanage(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "ColorManagedSequencerColorspaceSettings", "Input color space settings"); prop = RNA_def_property(srna, "name", PROP_ENUM, PROP_NONE); + RNA_def_property_flag(prop, PROP_ENUM_NO_CONTEXT); RNA_def_property_enum_items(prop, color_space_items); RNA_def_property_enum_funcs(prop, "rna_ColorManagedColorspaceSettings_colorspace_get", "rna_ColorManagedColorspaceSettings_colorspace_set",