[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25658] trunk/blender/source/blender: made region type into an enum
Campbell Barton
ideasman42 at gmail.com
Fri Jan 1 21:50:58 CET 2010
Revision: 25658
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25658
Author: campbellbarton
Date: 2010-01-01 21:50:58 +0100 (Fri, 01 Jan 2010)
Log Message:
-----------
made region type into an enum
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesrna/intern/rna_screen.c
Modified: trunk/blender/source/blender/makesdna/DNA_screen_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_screen_types.h 2010-01-01 19:10:31 UTC (rev 25657)
+++ trunk/blender/source/blender/makesdna/DNA_screen_types.h 2010-01-01 20:50:58 UTC (rev 25658)
@@ -212,14 +212,16 @@
#define SCREEN_HANDLER_VERSE 3
/* regiontype, first two are the default set */
-#define RGN_TYPE_WINDOW 0
-#define RGN_TYPE_HEADER 1
-#define RGN_TYPE_CHANNELS 2
-#define RGN_TYPE_TEMPORARY 3
-#define RGN_TYPE_UI 4
-#define RGN_TYPE_TOOLS 5
-#define RGN_TYPE_TOOL_PROPS 6
-#define RGN_TYPE_PREVIEW 7
+enum {
+ RGN_TYPE_WINDOW = 0,
+ RGN_TYPE_HEADER,
+ RGN_TYPE_CHANNELS,
+ RGN_TYPE_TEMPORARY,
+ RGN_TYPE_UI,
+ RGN_TYPE_TOOLS,
+ RGN_TYPE_TOOL_PROPS,
+ RGN_TYPE_PREVIEW
+};
/* region alignment */
#define RGN_ALIGN_NONE 0
Modified: trunk/blender/source/blender/makesrna/intern/rna_screen.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_screen.c 2010-01-01 19:10:31 UTC (rev 25657)
+++ trunk/blender/source/blender/makesrna/intern/rna_screen.c 2010-01-01 20:50:58 UTC (rev 25658)
@@ -23,6 +23,7 @@
*/
#include <stdlib.h>
+#include <stddef.h>
#include "RNA_define.h"
#include "RNA_types.h"
@@ -37,9 +38,10 @@
{RGN_TYPE_WINDOW, "WINDOW", 0, "Window", ""},
{RGN_TYPE_HEADER, "HEADER", 0, "Header", ""},
{RGN_TYPE_CHANNELS, "CHANNELS", 0, "Channels", ""},
- {RGN_TYPE_TOOLS, "TOOLS", 0, "Tools", ""},
{RGN_TYPE_TEMPORARY, "TEMPORARY", 0, "Temporary", ""},
{RGN_TYPE_UI, "UI", 0, "UI", ""},
+ {RGN_TYPE_TOOLS, "TOOLS", 0, "Tools", ""},
+ {RGN_TYPE_TOOL_PROPS, "TOOL_PROPS", 0, "Tool Properties", ""},
{RGN_TYPE_PREVIEW, "PREVIEW", 0, "Preview", ""},
{0, NULL, 0, NULL, NULL}};
@@ -154,8 +156,9 @@
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Region ID", "Unique ID for this region.");
- prop= RNA_def_property(srna, "type", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "regiontype");
+ prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "regiontype");
+ RNA_def_property_enum_items(prop, region_type_items);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Region Type", "Type of this region.");
More information about the Bf-blender-cvs
mailing list