[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59175] trunk/blender/source/blender/ blenkernel/BKE_key.h: This was merged by acident, sorry

[Sergey Sharybin]

Revision: 59175
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59175
Author:   nazgul
Date:     2013-08-16 08:31:39 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
This was merged by acident, sorry

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_key.h

Modified: trunk/blender/source/blender/blenkernel/BKE_key.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_key.h	2013-08-16 08:26:34 UTC (rev 59174)
+++ trunk/blender/source/blender/blenkernel/BKE_key.h	2013-08-16 08:31:39 UTC (rev 59175)
@@ -74,8 +74,7 @@
 void             BKE_keyblock_copy_settings(struct KeyBlock *kb_dst, const struct KeyBlock *kb_src);
 char            *BKE_keyblock_curval_rnapath_get(struct Key *key, struct KeyBlock *kb);
 // needed for the GE
-void BKE_key_evaluate_relative(const int start, int end, const int tot, char *basispoin, struct Key *key, struct KeyBlock *actkb,
-                               float **all_keyblock_weights, const int mode);
+void BKE_key_evaluate_relative(const int start, int end, const int tot, char *basispoin, struct Key *key, struct KeyBlock *actkb, const int mode);
 
 /* conversion functions */
 void    BKE_key_convert_to_mesh(struct KeyBlock *kb, struct Mesh *me);