[Bf-blender-cvs] [70eee6a] gooseberry: Merge branch 'master' into gooseberry

[Lukas Tönne]

Commit: 70eee6a0ed970e9c2fea02615b441cc58062660f
Author: Lukas Tönne
Date:   Wed Jan 7 16:17:16 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB70eee6a0ed970e9c2fea02615b441cc58062660f

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/blenkernel/intern/particle.c
index 50e1a47,dfc6285..07beb03
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@@ -2727,10 -2999,8 +2727,10 @@@ void psys_cache_paths(ParticleSimulatio
  		DM_ensure_tessface(psmd->dm);
  	}
  
 +	shapekey = shapekey_data = BKE_key_evaluate_particles(sim->ob, sim->psys, &totshapekey);
 +
  	/*---first main loop: create all actual particles' paths---*/
- 	LOOP_SHOWN_PARTICLES {
+ 	LOOP_PARTICLES {
  		if (!psys->totchild) {
  			psys_get_texture(sim, pa, &ptex, PAMAP_LENGTH, 0.f);
  			pa_length = ptex.length * (1.0f - part->randlength * psys_frand(psys, psys->seed + p));