Revision: 41211
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41211
Author:   campbellbarton
Date:     2011-10-23 04:48:13 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
fix for incorrect keying set names 'Scale' vs 'Scaling', where 'Scale' was hard 
coded in auto keyframe when 'Only Insert Needed' option was enabled and would 
always fail to return a keying set.

- to be included in 2.60a.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c      
2011-10-23 04:13:56 UTC (rev 41210)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c      
2011-10-23 04:48:13 UTC (rev 41211)
@@ -4590,7 +4590,7 @@
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, 
MODIFYKEY_MODE_INSERT, cfra);
                        }
                        if (doScale) {
-                               KeyingSet *ks= 
ANIM_builtin_keyingset_get_named(NULL, "Scale");
+                               KeyingSet *ks= 
ANIM_builtin_keyingset_get_named(NULL, "Scaling");
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, 
MODIFYKEY_MODE_INSERT, cfra);
                        }
                }
@@ -4705,7 +4705,7 @@
                                                ANIM_apply_keyingset(C, 
&dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                        if (doScale) {
-                                               KeyingSet *ks= 
ANIM_builtin_keyingset_get_named(NULL, "Scale");
+                                               KeyingSet *ks= 
ANIM_builtin_keyingset_get_named(NULL, "Scaling");
                                                ANIM_apply_keyingset(C, 
&dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                }

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

Reply via email to