[Bf-blender-cvs] [1938fca] alembic: Fix fo 'simple' particle hair matrix calculation.

[Lukas Tönne]

Commit: 1938fcac8e3652ff527587bc229848c2cfeee7a7
Author: Lukas Tönne
Date:   Wed May 6 15:36:46 2015 +0200
Branches: alembic
https://developer.blender.org/rB1938fcac8e3652ff527587bc229848c2cfeee7a7

Fix fo 'simple' particle hair matrix calculation.

The parent matrix is used for single-parent children ('simple'), in
which case the pa->num_dmcache has to be used to get the correct
position on subdivided meshes.

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

M	source/blender/blenkernel/intern/particle.c

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index b8d33e8..1c3e547 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3034,7 +3034,7 @@ void psys_child_mat_to_object(Object *ob, ParticleSystem *psys, ParticleSystemMo
 	}
 	else {
 		ParticleData *pa = &psys->particles[cpa->parent];
-		psys_particle_on_emitter(psmd, psys->part->from, pa->num, DMCACHE_ISCHILD, pa->fuv, pa->foffset, co, NULL, NULL, NULL, NULL, NULL);
+		psys_particle_on_emitter(psmd, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co, NULL, NULL, NULL, NULL, NULL);
 		psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, pa, hairmat);
 	}