From 844b40b0c174bbf5117b42427b0bc020a73bb60c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 13 Aug 2018 11:57:18 +0200 Subject: Fix T56344: Crash when used Twist for Emitter type of Particles System. That effect is NOP with emitter particles anyway... --- source/blender/blenkernel/intern/particle_child.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source') diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c index c921e1ea107..79c3f247232 100644 --- a/source/blender/blenkernel/intern/particle_child.c +++ b/source/blender/blenkernel/intern/particle_child.c @@ -737,6 +737,10 @@ static void do_twist(const ParticleChildModifierContext *modifier_ctx, ParticleTexture *ptex = modifier_ctx->ptex; ParticleSettings *part = sim->psys->part; /* Early output checks. */ + if (modifier_ctx->parent_keys == NULL) { + /* Cannot get axis of rotation... */ + return; + } if (part->childtype != PART_CHILD_PARTICLES) { /* Interpolated children behave weird with twist. */ return; -- cgit v1.2.3