diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:57:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:57:18 +0300 |
| commit | 844b40b0c174bbf5117b42427b0bc020a73bb60c (patch) | |
| tree | b3148b6186b00fc86a7f3ed290fa9eaf6d3fbf33 /source | |
| parent | 9d59851ca3d68fdee221f050c9f4a69ca085b432 (diff) | |
Fix T56344: Crash when used Twist for Emitter type of Particles System.
That effect is NOP with emitter particles anyway...
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_child.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |