diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-30 02:25:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-30 02:28:12 +0300 |
| commit | b3478930d895a610534e6b1ef3eeb105e43f5834 (patch) | |
| tree | 5d364aa6512ae104f32b3ec25f3a6d04fef94ed5 /source/blender/editors | |
| parent | 70582cf8d26e4ba5d6ccb0d1044d16e239fa655e (diff) | |
Fix crash adding workspace
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 43787abd352..fffc28d1cdf 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3883,9 +3883,10 @@ static bool ui_but_is_mouse_over_icon_extra(const ARegion *region, uiBut *but, c static int ui_do_but_TAB(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, const wmEvent *event) { if (data->state == BUTTON_STATE_HIGHLIGHT) { - const int rna_type = RNA_property_type(but->rnaprop); + const int rna_type = but->rnaprop ? RNA_property_type(but->rnaprop) : 0; - if (ELEM(rna_type, PROP_POINTER, PROP_STRING) && + if (but->rnaprop && + ELEM(rna_type, PROP_POINTER, PROP_STRING) && (but->custom_data != NULL) && (event->type == LEFTMOUSE) && ((event->val == KM_DBL_CLICK) || event->ctrl)) |