diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 31c0125584a..48071561d6e 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -145,7 +145,7 @@ typedef struct ParticleThreadContext { float maxweight; int *index, *skip, jitlevel; - int from, cfrom, distr; + int cfrom, distr; struct ParticleData *tpars; diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 2a17f53c549..b561ff43296 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -1080,7 +1080,6 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti ctx->jitoff= jitter_offset; ctx->weight= element_weight; ctx->maxweight= maxweight; - ctx->from= (children) ? PART_FROM_CHILD : from; ctx->cfrom= cfrom; ctx->distr= distr; ctx->dm= dm; |