[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41174] trunk/blender/release/scripts/ startup/keyingsets_builtins.py: svn merge -r41171:41170 .

[Campbell Barton]

Revision: 41174
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41174
Author:   campbellbarton
Date:     2011-10-21 08:31:28 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
svn merge -r41171:41170 .  --- fix coming next

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41171

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/keyingsets_builtins.py

Modified: trunk/blender/release/scripts/startup/keyingsets_builtins.py
===================================================================
--- trunk/blender/release/scripts/startup/keyingsets_builtins.py	2011-10-21 08:16:15 UTC (rev 41173)
+++ trunk/blender/release/scripts/startup/keyingsets_builtins.py	2011-10-21 08:31:28 UTC (rev 41174)
@@ -364,16 +364,12 @@
             if prop == "_RNA_UI":
                 continue
 
-            # only do props which are marked as animatable, or those which are "numeric" types...
+            # for now, just add all of 'em
             prop_rna = type(bone).bl_rna.properties.get(prop, None)
             if prop_rna is None:
                 prop_path = '["%s"]' % prop
-
-                # XXX: the check below from r.40868 causes crashes [#28967] on ID-prop groups,
-                # so let's just include everything (doing nothing breaks keying of Sintel face rig)
-                #if bone.path_resolve(prop_path, False).rna_type in prop_type_compat:
-                #    ksi.addProp(ks, bone, prop_path)
-                ksi.addProp(ks, bone, prop_path)
+                if bone.path_resolve(prop_path, False).rna_type in prop_type_compat:
+                    ksi.addProp(ks, bone, prop_path)
             elif prop_rna.is_animatable:
                 ksi.addProp(ks, bone, prop)