Merged changes in the trunk up to revision 39661.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 24 Aug 2011 00:18:26 +0000 (00:18 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 24 Aug 2011 00:18:26 +0000 (00:18 +0000)
14 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index 0a694ef1bc42a7796edc373888744db4baf814a6,a20e799811bca283542b5e01b3af92de956d1d86..9566ef43845b30344c901f834efdc6b0ee498ac6
@@@ -83,10 -83,9 +83,10 @@@ else
          "blf",
          "mathutils",
          "mathutils.geometry",
 +        "Freestyle",
      )
  
-     FILTER_BPY_TYPES = ("bpy_struct", "Panel", "Menu", "Operator", "RenderEngine")  # allow
+     FILTER_BPY_TYPES = ("bpy_struct", "Panel", "ID")  # allow
      FILTER_BPY_OPS = ("import.scene", )  # allow
  
      # for quick rebuilds
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge