diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
| commit | a640587e25e43be8007fa0090a59fd9bb6d51e39 (patch) | |
| tree | ef780ec436232535a9e36ac233de1792ee8ba9e4 /source/blender/editors/sculpt_paint/sculpt.c | |
| parent | 99eb95337f74f1a303c774902ea29f7d378bac1b (diff) | |
| parent | 892637f60afbbb787334caa26f5342baf1d4a7d7 (diff) | |
Merge branch 'temp-openxr-blenderside' into soc-2019-openxrsoc-2019-openxr
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 79c4becd405..14c11523455 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -8371,9 +8371,8 @@ static void SCULPT_OT_optimize(wmOperatorType *ot) static bool sculpt_no_multires_poll(bContext *C) { Object *ob = CTX_data_active_object(C); - SculptSession *ss = ob->sculpt; - if (ss && ss->pbvh && SCULPT_mode_poll(C)) { - return BKE_pbvh_type(ss->pbvh) != PBVH_GRIDS; + if (SCULPT_mode_poll(C) && ob->sculpt && ob->sculpt->pbvh) { + return BKE_pbvh_type(ob->sculpt->pbvh) != PBVH_GRIDS; } return false; } |