diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-06-10 14:37:24 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-06-10 14:37:24 +0400 |
| commit | 93c1bf6d88f24a293907ee4327cefaf851b4ff94 (patch) | |
| tree | 1b485dc71695b703967adb9891d07e44e3424cdc /source/blender/makesrna/intern/rna_space.c | |
| parent | 00f37e911bb8fe2b3c2262909ad7ed5565fdb69e (diff) | |
Fix for r57316: SPACE_EMPTY *is* needed in RNA enum for now, exported keymaps abuse it...
So for now, static enum is back to its previous form, and the menu one is dynamically generated by a callback. Not nice, but works.
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 7bc42700d2b..6b03f7df5bd 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -60,6 +60,7 @@ EnumPropertyItem space_type_items[] = { +#if 0 /* XXX This can't work right now, because keymaps export abused SPACE_EMPTY, so we need it in RNA for now. */ {SPACE_VIEW3D, "VIEW_3D", ICON_VIEW3D, "3D View", ""}, {0, "", ICON_NONE, NULL, NULL}, {SPACE_TIME, "TIMELINE", ICON_TIME, "Timeline", ""}, @@ -82,6 +83,26 @@ EnumPropertyItem space_type_items[] = { {SPACE_FILE, "FILE_BROWSER", ICON_FILESEL, "File Browser", ""}, {0, "", ICON_NONE, NULL, NULL}, {SPACE_CONSOLE, "CONSOLE", ICON_CONSOLE, "Python Console", ""}, +#else + {SPACE_EMPTY, "EMPTY", ICON_NONE, "Empty", ""}, + {SPACE_VIEW3D, "VIEW_3D", ICON_VIEW3D, "3D View", ""}, + {SPACE_IPO, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""}, + {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", ""}, + {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", ""}, + {SPACE_FILE, "FILE_BROWSER", ICON_FILESEL, "File Browser", ""}, + {SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", ""}, + {SPACE_INFO, "INFO", ICON_INFO, "Info", ""}, + {SPACE_SEQ, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequence Editor", ""}, + {SPACE_TEXT, "TEXT_EDITOR", ICON_TEXT, "Text Editor", ""}, + {SPACE_ACTION, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", ""}, + {SPACE_NLA, "NLA_EDITOR", ICON_NLA, "NLA Editor", ""}, + {SPACE_TIME, "TIMELINE", ICON_TIME, "Timeline", ""}, + {SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", ""}, + {SPACE_LOGIC, "LOGIC_EDITOR", ICON_LOGIC, "Logic Editor", ""}, + {SPACE_CONSOLE, "CONSOLE", ICON_CONSOLE, "Python Console", ""}, + {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", ""}, + {SPACE_CLIP, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", ""}, +#endif {0, NULL, 0, NULL, NULL} }; |