blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T57477: Switching between edit mode, and particle edit mode crashes

This commit is contained in:
Sergey Sharybin 2018-11-16 14:21:57 +01:00
parent da344b4045
commit be405495a9
Notes: blender-bot 2023-02-14 08:08:56 +01:00 
Referenced by issue #57477, Switching between edit mode, and particle edit mode consistently crashes.
Referenced by issue #56282, Crash - going from Edit mode to Particle mode with 'Tab' key
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/physics/particle_edit.c
View File

@ -4829,10 +4829,18 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
edit = PE_create_current(depsgraph, scene, ob);
/* mesh may have changed since last entering editmode.
* note, this may have run before if the edit data was just created, so could avoid this and speed up a little */
if (edit && edit->psys)
/* Mesh may have changed since last entering editmode.
* note, this may have run before if the edit data was just created,
* so could avoid this and speed up a little. */
if (edit && edit->psys) {
/* Make sure pointer to the evaluated modifier data is up to date,
* with possible changes applied when object was outside of the
* edit mode. */
Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
edit->psmd_eval = (ParticleSystemModifierData *)modifiers_findByName(
object_eval, edit->psmd->modifier.name);
recalc_emitter_field(depsgraph, ob, edit->psys);
}
toggle_particle_cursor(C, 1);
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_PARTICLE, NULL);