[Bf-blender-cvs] [06ba233374d] master: RNA: rename Area.ui_type 'VIEW' enum identifier to 'IMAGE_EDITOR'
Campbell Barton
noreply at git.blender.org
Tue Sep 1 08:39:39 CEST 2020
Commit: 06ba233374dc9f3dfd2efb904d067abc9f04e3de
Author: Campbell Barton
Date: Tue Sep 1 16:35:47 2020 +1000
Branches: master
https://developer.blender.org/rB06ba233374dc9f3dfd2efb904d067abc9f04e3de
RNA: rename Area.ui_type 'VIEW' enum identifier to 'IMAGE_EDITOR'
The term makes sense in the image editor, but not among other editors
where we had both VIEW and VIEW_3D.
===================================================================
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 904c0281465..21ba130f925 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -242,9 +242,9 @@ const EnumPropertyItem rna_enum_space_action_mode_items[] = {
#undef SACT_ITEM_MASK
#undef SACT_ITEM_CACHEFILE
-#define SI_ITEM_VIEW(name, icon) \
+#define SI_ITEM_VIEW(identifier, name, icon) \
{ \
- SI_MODE_VIEW, "VIEW", icon, name, "View the image" \
+ SI_MODE_VIEW, identifier, icon, name, "View the image" \
}
#define SI_ITEM_UV \
{ \
@@ -260,7 +260,7 @@ const EnumPropertyItem rna_enum_space_action_mode_items[] = {
}
const EnumPropertyItem rna_enum_space_image_mode_all_items[] = {
- SI_ITEM_VIEW("View", ICON_FILE_IMAGE),
+ SI_ITEM_VIEW("VIEW", "View", ICON_FILE_IMAGE),
SI_ITEM_UV,
SI_ITEM_PAINT,
SI_ITEM_MASK,
@@ -268,14 +268,14 @@ const EnumPropertyItem rna_enum_space_image_mode_all_items[] = {
};
static const EnumPropertyItem rna_enum_space_image_mode_ui_items[] = {
- SI_ITEM_VIEW("View", ICON_FILE_IMAGE),
+ SI_ITEM_VIEW("VIEW", "View", ICON_FILE_IMAGE),
SI_ITEM_PAINT,
SI_ITEM_MASK,
{0, NULL, 0, NULL, NULL},
};
const EnumPropertyItem rna_enum_space_image_mode_items[] = {
- SI_ITEM_VIEW("Image Editor", ICON_IMAGE),
+ SI_ITEM_VIEW("IMAGE_EDITOR", "Image Editor", ICON_IMAGE),
SI_ITEM_UV,
{0, NULL, 0, NULL, NULL},
};
More information about the Bf-blender-cvs
mailing list