[Bf-blender-cvs] [2cec669d345] master: Fix T64912: Crash right clicking on 'Add New Material'

[Campbell Barton]

Commit: 2cec669d3456034adb41c9ab43598089f56f7554
Author: Campbell Barton
Date:   Tue May 21 16:57:31 2019 +1000
Branches: master
https://developer.blender.org/rB2cec669d3456034adb41c9ab43598089f56f7554

Fix T64912: Crash right clicking on 'Add New Material'

D4904 by @Gvgeo

===================================================================

M	source/blender/editors/interface/interface_context_menu.c

===================================================================

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) {