blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T71741: Crash showing the object relations menu

This commit is contained in:
Campbell Barton 2019-11-23 02:55:07 +11:00
parent b037ba2665
commit aadbb794cd
Notes: blender-bot 2023-02-14 11:20:29 +01:00 
Referenced by issue #71741, Crash when hovering "Relations" in object menu
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_modifier.c
View File

@ -923,6 +923,7 @@ bool edit_modifier_poll_generic(bContext *C,
{
PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", rna_type);
Object *ob = (ptr.owner_id) ? (Object *)ptr.owner_id : ED_object_active_context(C);
ModifierData *mod = ptr.data; /* May be NULL. */
if (!ob || ID_IS_LINKED(ob)) {
return 0;
@ -935,8 +936,10 @@ bool edit_modifier_poll_generic(bContext *C,
}
if (ID_IS_OVERRIDE_LIBRARY(ob)) {
CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override");
return (((ModifierData *)ptr.data)->flag & eModifierFlag_OverrideLibrary_Local) != 0;
if ((mod != NULL) && (mod->flag & eModifierFlag_OverrideLibrary_Local) == 0) {
CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override");
return 0;
}
}
if (!is_editmode_allowed && CTX_data_edit_object(C) != NULL) {