[Bf-blender-cvs] [75f82d28e38] master: Fix T72235: crash entering particle editmode with non-valid PTCacheEdit psys pointer

Philipp Oeser noreply at git.blender.org
Wed Jan 8 13:38:58 CET 2020


Commit: 75f82d28e38f2bcfa9a261a39bbc4da82c65e7d3
Author: Philipp Oeser
Date:   Wed Jan 8 13:11:18 2020 +0100
Branches: master
https://developer.blender.org/rB75f82d28e38f2bcfa9a261a39bbc4da82c65e7d3

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

===================================================================

M	source/blender/editors/physics/particle_edit.c

===================================================================

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);
   }



More information about the Bf-blender-cvs mailing list