diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-07 13:24:09 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-12-07 16:17:17 +0300 |
| commit | c1f6ecdfabfbfbe3fe4207722589e02953df736e (patch) | |
| tree | b85d47eeae46b96cfd51e88c37357857cf716dbf /source/blender | |
| parent | 012a44cff11ffb12a65409ba68b4e66caded28a7 (diff) | |
Fix T58902: error getting tools for Image Editor (modes Paint and Mask)
Maniphest Tasks: T58902
Differential Revision: https://developer.blender.org/D4044
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_workspace.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index bf6e1d28cb2..6504cf8914b 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -61,6 +61,7 @@ extern const EnumPropertyItem rna_enum_mesh_delimit_mode_items[]; extern const EnumPropertyItem rna_enum_space_graph_mode_items[]; extern const EnumPropertyItem rna_enum_space_type_items[]; extern const EnumPropertyItem rna_enum_space_image_mode_items[]; +extern const EnumPropertyItem rna_enum_space_image_mode_all_items[]; extern const EnumPropertyItem rna_enum_space_action_mode_items[]; extern const EnumPropertyItem rna_enum_region_type_items[]; extern const EnumPropertyItem rna_enum_object_modifier_type_items[]; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 9bfd1d34b2b..8a792e4fa41 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -177,7 +177,7 @@ const EnumPropertyItem rna_enum_space_action_mode_items[] = { #define SI_ITEM_MASK \ {SI_MODE_MASK, "MASK", ICON_MOD_MASK, "Mask", "Mask editing"} -static const EnumPropertyItem rna_enum_space_image_mode_all_items[] = { +const EnumPropertyItem rna_enum_space_image_mode_all_items[] = { SI_ITEM_VIEW("View", ICON_FILE_IMAGE), SI_ITEM_UV, SI_ITEM_PAINT, diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index a79dc05e09b..f0c00bd1940 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -301,7 +301,7 @@ static void rna_def_workspace_tools(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "from_space_image_mode", "rna_WorkSpace_tools_from_space_image_mode"); RNA_def_function_ui_description(func, ""); - parm = RNA_def_enum(func, "mode", rna_enum_space_image_mode_items, 0, "", ""); + parm = RNA_def_enum(func, "mode", rna_enum_space_image_mode_all_items, 0, "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_boolean(func, "create", false, "Create", ""); /* return type */ |