Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-10-28 19:09:45 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:30:05 +0300
commit34762de38f7b64542e33cdfc3702b0644b16833a (patch)
tree66cd8b90ae3cc0aa2b402119b4f1db7591dfb141 /source/blender/blenkernel
parent09f171c5259258f57c346063c251a8633fd51193 (diff)
Removed unused variable.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_particle.h2
-rw-r--r--source/blender/blenkernel/intern/particle_distribute.c1
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;