diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:58:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:58:24 +0300 |
| commit | d3250593d07857e4f73b31bbff54536fb306a245 (patch) | |
| tree | accbbf4e40ed3d42f2dd095888bae10f26e6e88d /source/blender/blenkernel/intern/particle_child.c | |
| parent | 4710af81a4003cf1c19f7fc16c08a53146bf3fba (diff) | |
| parent | 844b40b0c174bbf5117b42427b0bc020a73bb60c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle_child.c')
| -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 7cfad93224d..f21b3a74fea 100644 --- a/source/blender/blenkernel/intern/particle_child.c +++ b/source/blender/blenkernel/intern/particle_child.c @@ -699,6 +699,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; |