Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T56344: Crash when used Twist for Emitter type of Particles System.

Browse Source 
That effect is NOP with emitter particles anyway...
This commit is contained in:
Bastien Montagne
2018-08-13 11:57:18 +02:00
parent 9d59851ca3
commit 844b40b0c1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/particle_child.c
View File

@@ -737,6 +737,10 @@ static void do_twist(const ParticleChildModifierContext *modifier_ctx,
ParticleTexture *ptex = modifier_ctx->ptex; ParticleTexture *ptex = modifier_ctx->ptex;
ParticleSettings *part = sim->psys->part; ParticleSettings *part = sim->psys->part;
/* Early output checks. */ /* Early output checks. */
if (modifier_ctx->parent_keys == NULL) {
/* Cannot get axis of rotation... */
return;
}
if (part->childtype != PART_CHILD_PARTICLES) { if (part->childtype != PART_CHILD_PARTICLES) {
/* Interpolated children behave weird with twist. */ /* Interpolated children behave weird with twist. */
return; return;