Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-08-15 22:38:31 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-08-15 22:39:51 +0300
commitcbd1739004f854f4970f95ea3ed512f2aecf2fe7 (patch)
tree868d165404351451d4c09c919ff03dc93a3ce2a8 /source/blender/editors/space_buttons
parentb5fe838d44089abef761cb4723aa2d795299c68f (diff)
Fix T68705: Changing any editor to the properties crashes Blender
Issue introduced (more like exposed) in b7f86ff72273.
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r--source/blender/editors/space_buttons/buttons_context.c4
1 files 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;
}