[Bf-blender-cvs] [409988e] gooseberry: Fix for own error in merging alembic branch, breaking shape keys.

Lukas Tönne noreply at git.blender.org
Wed May 6 19:24:50 CEST 2015


Commit: 409988e3c3c0f08b498a2c40765f86a00ff0e751
Author: Lukas Tönne
Date:   Wed May 6 19:23:02 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB409988e3c3c0f08b498a2c40765f86a00ff0e751

Fix for own error in merging alembic branch, breaking shape keys.

Both the gooseberry and alembic branches contain extensions of the Key
DNA structure, in order to make it work for particles and caches
respectively. This was giving badly resolved conflicts on merge.

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

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

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

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 23d9c07..538a33b 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -179,6 +179,7 @@ Key *BKE_key_add_particles(Object *ob, ParticleSystem *psys)    /* particles are
 	
 	key->type = KEY_NORMAL;
 	BKE_key_set_from_particles(key, ob, psys);
+	key->fromtype = KEY_FROMTYPE_ID;
 	
 	key->uidgen = 1;
 	
@@ -620,8 +621,8 @@ static bool key_pointer_size(const Key *key, const int mode, int *poinsize, int
 			if (!key->from)
 				return false;
 			
-			switch (GS(key->from->name)) {
-				case ID_ME:
+			switch (key->from_extra.type) {
+				case KEY_OWNER_MESH:
 					*ofs = sizeof(float) * 3;
 					*poinsize = *ofs;
 					break;




More information about the Bf-blender-cvs mailing list