Merged changes in the trunk up to revision 35972.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Apr 2011 12:46:33 +0000 (12:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Apr 2011 12:46:33 +0000 (12:46 +0000)
16 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c

index 4ed7ae36e8606f0498ca9df144b7d7bbeb8e8212,fde275c71906aeb9c51c25495f9788977c74b674..46b305bb39b0d6e41f76482d3302cbe899c252cd
@@@ -72,10 -72,9 +72,10 @@@ else
          "blf",
          "mathutils",
          "mathutils.geometry",
 +        "Freestyle",
      )
  
-     FILTER_BPY_TYPES = ("PropertyGroup", "Panel", "Menu", "Operator", "RenderEngine")  # allow
+     FILTER_BPY_TYPES = ("bpy_struct", "Panel", "Menu", "Operator", "RenderEngine")  # allow
      FILTER_BPY_OPS = ("import.scene", )  # allow
  
      # for quick rebuilds
Simple merge
Simple merge
Simple merge
Simple merge