[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35260] trunk/blender: fix for inconsistency reported as bug [#26245] bpy.data. keys collides with the built-in func keys()

[Campbell Barton]

Revision: 35260
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35260
Author:   campbellbarton
Date:     2011-02-28 12:05:43 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
fix for inconsistency reported as bug [#26245] bpy.data.keys collides with the built-in func keys()

Modified Paths:
--------------
    trunk/blender/intern/tools/dump_rna2xml.py
    trunk/blender/source/blender/makesrna/intern/rna_main.c

Modified: trunk/blender/intern/tools/dump_rna2xml.py
===================================================================
--- trunk/blender/intern/tools/dump_rna2xml.py	2011-02-28 10:00:02 UTC (rev 35259)
+++ trunk/blender/intern/tools/dump_rna2xml.py	2011-02-28 12:05:43 UTC (rev 35260)
@@ -42,9 +42,6 @@
     property_typemap = {}
 
     for attr in dir(bpy.types):
-        if attr.startswith("_") or attr in ("register", "unregister"):
-            continue
-
         cls = getattr(bpy.types, attr)
         if issubclass(cls, invalid_classes):
             continue
@@ -77,6 +74,7 @@
         if issubclass(value_type, invalid_classes):
             return
 
+        # XXX, fixme, pointcache has eternal nested pointer to its self.
         if value == parent:
             return
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_main.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main.c	2011-02-28 10:00:02 UTC (rev 35259)
+++ trunk/blender/source/blender/makesrna/intern/rna_main.c	2011-02-28 12:05:43 UTC (rev 35260)
@@ -282,7 +282,7 @@
 		{"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks.", RNA_def_main_brushes},
 		{"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks.", RNA_def_main_worlds},
 		{"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks.", RNA_def_main_groups},
-		{"shape_keys", "Key", "rna_Main_key_begin", "Keys", "Key datablocks.", NULL},
+		{"shape_keys", "Key", "rna_Main_key_begin", "Shape Keys", "Shape Key datablocks.", NULL},
 		{"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks (DEPRECATED).", NULL},
 		{"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks.", RNA_def_main_texts},
 		{"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound datablocks.", RNA_def_main_sounds},