[Bf-blender-cvs] [8af36c2] temp_merge_gooseberry_hair: Removed unused variable.

[Lukas Tönne]

Commit: 8af36c2384dcf4b1d4349517297d9075ce4224bf
Author: Lukas Tönne
Date:   Tue Oct 28 17:09:45 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB8af36c2384dcf4b1d4349517297d9075ce4224bf

Removed unused variable.

===================================================================

M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/intern/particle_distribute.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 7b8810c..8818237 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 2a17f53..b561ff4 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;