diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-08 15:11:18 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-08 15:33:46 +0300 |
commit | 75f82d28e38f2bcfa9a261a39bbc4da82c65e7d3 (patch) | |
tree | 19dd82bad024de68809214ff50c4af5c713f001f /source/blender/editors/physics | |
parent | 15ef1d4c8026aea3319efdc118a2189d7d71b450 (diff) |
Fix T72235: crash entering particle editmode with non-valid PTCacheEdit psys pointer
Caused by own rBe02ecd599bdc.
Can happen with e.g. cloth.
Also fixes T59583
Maniphest Tasks: T72235, T59583
Differential Revision: https://developer.blender.org/D6547
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 9d3388bd220..120c4929ecf 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1597,7 +1597,7 @@ void PE_update_object(Depsgraph *depsgraph, Scene *scene, Object *ob, int usefla /* Only do this for emitter particles because drawing PE_FADE_TIME is not respected in 2.8 yet * and flagging with PEK_HIDE will prevent selection. This might get restored once this is * supported in drawing (but doesn't make much sense for hair anyways). */ - if (edit->psys->part->type == PART_EMITTER) { + if (edit->psys && edit->psys->part->type == PART_EMITTER) { PE_hide_keys_time(scene, edit, CFRA); } |