[Bf-blender-cvs] [4ad69e1] gooseberry: Initialize new hair shape keys with data from the current particle keys.

[Lukas Tönne]

Commit: 4ad69e11e86c083070207bd774aa10d97aac313d
Author: Lukas Tönne
Date:   Wed Jan 28 14:36:37 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB4ad69e11e86c083070207bd774aa10d97aac313d

Initialize new hair shape keys with data from the current particle keys.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index c7aca72..d776661 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -374,15 +374,19 @@ KeyBlock *BKE_psys_insert_shape_key(Scene *UNUSED(scene), Object *ob, ParticleSy
 	}
 
 	if (newkey || !from_mix) {
-		/* create from mesh */
+		/* create from particles */
 		kb = BKE_keyblock_add_ctime(key, name, false);
 		BKE_keyblock_convert_from_hair_keys(ob, psys, kb);
 	}
 	else {
+		/* copy from current values */
+		int totelem;
+		float *data = BKE_key_evaluate_particles(ob, psys, &totelem);
+
 		/* create new block with prepared data */
 		kb = BKE_keyblock_add_ctime(key, name, false);
-		kb->data = NULL;
-		kb->totelem = 0;
+		kb->data = data;
+		kb->totelem = totelem;
 	}
 
 	return kb;