[Bf-blender-cvs] [a17abec24bc] greasepencil-object: Fix T58902: error getting tools for Image Editor (modes Paint and Mask)
Philipp Oeser
noreply at git.blender.org
Fri Dec 7 17:16:00 CET 2018
Commit: a17abec24bcc1e722e3857f23479c4607a565fe4
Author: Philipp Oeser
Date: Fri Dec 7 11:24:09 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa17abec24bcc1e722e3857f23479c4607a565fe4
Fix T58902: error getting tools for Image Editor (modes Paint and Mask)
Maniphest Tasks: T58902
Differential Revision: https://developer.blender.org/D4044
===================================================================
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_workspace.c
===================================================================
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 */
More information about the Bf-blender-cvs
mailing list