From 2cec669d3456034adb41c9ab43598089f56f7554 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 21 May 2019 16:57:31 +1000 Subject: Fix T64912: Crash right clicking on 'Add New Material' D4904 by @Gvgeo --- source/blender/editors/interface/interface_context_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index 9ef98db49f5..d1f72519046 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -92,7 +92,7 @@ static const char *shortcut_get_operator_property(bContext *C, uiBut *but, IDPro { if (but->optype) { /* Operator */ - *prop = (but->opptr) ? IDP_CopyProperty(but->opptr->data) : NULL; + *prop = (but->opptr && but->opptr->data) ? IDP_CopyProperty(but->opptr->data) : NULL; return but->optype->idname; } else if (but->rnaprop) { -- cgit v1.2.3