[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55190] trunk/blender/source/blender: Colormanagement: Fix issue with colorspaces' description too short, and reduce usage of magic numbers.

[Bastien Montagne]

Revision: 55190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55190
Author:   mont29
Date:     2013-03-11 11:15:05 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Colormanagement: Fix issue with colorspaces' description too short, and reduce usage of magic numbers.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    trunk/blender/source/blender/imbuf/intern/colormanagement.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c

Modified: trunk/blender/source/blender/imbuf/intern/IMB_colormanagement_intern.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_colormanagement_intern.h	2013-03-11 11:09:57 UTC (rev 55189)
+++ trunk/blender/source/blender/imbuf/intern/IMB_colormanagement_intern.h	2013-03-11 11:15:05 UTC (rev 55190)
@@ -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 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 ColorManagedView {
 	struct ColorManagedView *next, *prev;
 	int index;
-	char name[64];
+	char name[MAX_COLORSPACE_NAME];
 } ColorManagedView;
 
 /* ** Initialization / De-initialization ** */

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-03-11 11:09:57 UTC (rev 55189)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-03-11 11:15:05 UTC (rev 55190)
@@ -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 */

Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_color.c	2013-03-11 11:09:57 UTC (rev 55189)
+++ trunk/blender/source/blender/makesrna/intern/rna_color.c	2013-03-11 11:15:05 UTC (rev 55190)
@@ -993,6 +993,7 @@
 	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",