blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix T58902: error getting tools for Image Editor (modes Paint and Mask) 

Maniphest Tasks: T58902

Differential Revision: https://developer.blender.org/D4044
This commit is contained in:
Philipp Oeser 2018-12-07 11:24:09 +01:00
parent 012a44cff1
commit c1f6ecdfab
Notes: blender-bot 2023-02-14 11:35:46 +01:00 
Referenced by issue #59192, Armature Wireframe display doesn't work
Referenced by issue #58993, Duplicating after setting a rigid body world crashes Blender
Referenced by issue #58962, Transparent x-ray artifacts
Referenced by issue #58902, "Texture Paint" Workspace causes Traceback Error Popup
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesrna/RNA_enum_types.h
View File

@ -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[];

2
source/blender/makesrna/intern/rna_space.c
View File

@ -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,

2
source/blender/makesrna/intern/rna_workspace.c
View File

@ -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 */