diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-05-21 09:57:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-21 09:58:34 +0300 |
| commit | 2cec669d3456034adb41c9ab43598089f56f7554 (patch) | |
| tree | 6d8640bb266bdc36b74c63e8bfb5a0e19fc7cffa | |
| parent | b2c74c05644364978f76a5d51b728b264c9fcdcb (diff) | |
Fix T64912: Crash right clicking on 'Add New Material'
D4904 by @Gvgeo
| -rw-r--r-- | source/blender/editors/interface/interface_context_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |