Merged changes in the trunk up to revision 54802.

2013-02-24 03:39:20 +00:00
parent 3df023ae82 93c3593d82
commit d120ec146d
401 changed files with 4578 additions and 2960 deletions
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -558,7 +558,8 @@ typedef enum eAnimUnitConv_Flags {
 	/* only touch selected BezTriples */
 	ANIM_UNITCONV_ONLYSEL   = (1 << 2),
 	/* only touch selected vertices */
-	ANIM_UNITCONV_SELVERTS  = (1 << 3)
+	ANIM_UNITCONV_SELVERTS  = (1 << 3),
+	ANIM_UNITCONV_SKIPKNOTS  = (1 << 4),
 } eAnimUnitConv_Flags;

 /* Get unit conversion factor for given ID + F-Curve */