From cbd1739004f854f4970f95ea3ed512f2aecf2fe7 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 15 Aug 2019 16:38:31 -0300 Subject: Fix T68705: Changing any editor to the properties crashes Blender Issue introduced (more like exposed) in b7f86ff72273. --- source/blender/editors/space_buttons/buttons_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index fde8b8f85f8..bb381e0dd1e 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -785,11 +785,11 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextPath *path = sbuts ? sbuts->path : NULL; - if (sbuts->mainb == BCONTEXT_TOOL) { + if (!path) { return 0; } - if (!path) { + if (sbuts->mainb == BCONTEXT_TOOL) { return 0; } -- cgit v1.2.3