diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-25 12:58:08 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-06-18 10:28:21 +0300 |
commit | 42a517779ab3d1f884195282744dd57444641a38 (patch) | |
tree | f119a94ba5396a0e710df50650d6f99ae738f522 | |
parent | 60bf482dba721e3878770e6abefa3b35acca0021 (diff) |
Fix T77047: Dyntopo Sample detail size on hidden mesh causes crash
The `Toolbar` and `Sidebar` hide the corresponding panel
`VIEW3D_PT_sculpt_dyntopo` by polling for context.sculpt_object and
context.tool_settings.sculpt. In the Active Tool in the Properties
Editor this poll does not return False though, thus the
sample_detail_size is possible from there.
Second security check (the operator poll `SCULPT_mode_poll`) checks the
active object -- that is still valid even if hidden, so we are allowed
to execute the operator. However the active object becomes NULL once the
area is switched in `sample_detail()` -- see `CTX_wm_area_set`), leading
to the crash.
Dont think there is a quick and easy way to do this in the poll from the
Properties Editor, so just check for a valid active abject in the
operator and return OPERATOR_CANCELLED if we dont have it.
Maniphest Tasks: T77047
Differential Revision: https://developer.blender.org/D7832
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_detail.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.c b/source/blender/editors/sculpt_paint/sculpt_detail.c index a99aa3d1bcf..145f0c752a5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.c +++ b/source/blender/editors/sculpt_paint/sculpt_detail.c @@ -259,8 +259,11 @@ static int sample_detail(bContext *C, int mx, int my, int mode) ED_view3d_viewcontext_init(C, &vc, depsgraph); Object *ob = vc.obact; - SculptSession *ss = ob->sculpt; + if (ob == NULL) { + return OPERATOR_CANCELLED; + } + SculptSession *ss = ob->sculpt; if (!ss->pbvh) { return OPERATOR_CANCELLED; } |