Revision: 17565
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17565
Author:   aligorith
Date:     2008-11-25 02:19:09 +0100 (Tue, 25 Nov 2008)

Log Message:
-----------
AnimSys2: Final (I hope) bugfix for Joining Meshes with Shapekeys

Modified Paths:
--------------
    branches/animsys2/source/blender/src/meshtools.c

Modified: branches/animsys2/source/blender/src/meshtools.c
===================================================================
--- branches/animsys2/source/blender/src/meshtools.c    2008-11-25 00:59:15 UTC 
(rev 17564)
+++ branches/animsys2/source/blender/src/meshtools.c    2008-11-25 01:19:09 UTC 
(rev 17565)
@@ -311,7 +311,7 @@
                                                                
BLI_addtail(&key->block, kbn);
                                                                kbn->adrcode= 
key->totkey;
                                                                key->totkey++;
-                                                               if 
(key->totkey==1) key->refkey= kb;
+                                                               if 
(key->totkey==1) key->refkey= kbn;
                                                                
                                                                /* also, copy 
corresponding ipo-curve to ipo-block if applicable */
                                                                if 
(me->key->ipo && key->ipo) {


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to