[Bf-blender-cvs] [97caee6] hair_immediate_fixes: Removed unused variable.

[Lukas Tönne]

Commit: 97caee6c4659abd58fa3b66ee35f1e0797fcf0e1
Author: Lukas Tönne
Date:   Tue Oct 28 17:09:45 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB97caee6c4659abd58fa3b66ee35f1e0797fcf0e1

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 04e5d1e..412aac6 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs