[Bf-blender-cvs] [1e3e6e2] alembic: Don't use the refkey for calculating shape deltas, but only for the base shape.

[Lukas Tönne]

Commit: 1e3e6e2f186c58d6534c33f405cbe45614166451
Author: Lukas Tönne
Date:   Fri May 8 15:04:17 2015 +0200
Branches: alembic
https://developer.blender.org/rB1e3e6e2f186c58d6534c33f405cbe45614166451

Don't use the refkey for calculating shape deltas, but only for the base
shape.

Shape keys distinguish between the base shape (shape without any keys)
and the individual reference shapes for each shape key (which define
the delta offsets). For strand shapes, which have to work on top of
animation, the base shape must be the original cache result rather than
a static shape, but the delta for each keyblock is still calculated
wrt. an explicit shape.

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

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

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

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 91aabc1..2f1e3cd 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -796,10 +796,7 @@ void BKE_key_evaluate_relative_ex(const int start, int end, const int tot, char
 
 				poin = basispoin;
 				from = key_block_get_data(key, actkb, kb, &freefrom);
-				if (refdata) {
-					reffrom = refdata;
-				}
-				else {
+				{
 					/* reference now can be any block */
 					KeyBlock *refb = BLI_findlink(&key->block, kb->relative);
 					if (refb == NULL) continue;