Merged changes in the trunk up to revision 40299.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Sep 2011 18:54:16 +0000 (18:54 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Sep 2011 18:54:16 +0000 (18:54 +0000)
20 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

index df17c54b55f3a3bb8f4e83140f45dab12152b25a,91248c084060fb5d46a2d43ebcc5048f75e5374d..4e17fcd8dda1fe61ee2b6e10941134f1da513f6b
@@@ -85,10 -85,9 +85,10 @@@ else
          "blf",
          "mathutils",
          "mathutils.geometry",
 +        "Freestyle",
      )
  
-     FILTER_BPY_TYPES = ("bpy_struct", "Panel", "ID")  # allow
+     FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID")  # allow
      FILTER_BPY_OPS = ("import.scene", )  # allow
  
      # for quick rebuilds
index 95a34ca4a0d7eb054452e07470584d7d9b73f8d1,9cf0a92742fc376caf6fffa9fe665213aefde476..21ffaba8f89f5dd47cacdc23699c5af7c4feff2d
@@@ -35,8 -35,6 +35,7 @@@ set(IN
        ../blenfont
        ../blenlib
        ../blenloader
-       ../editors/include
 +      ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
Simple merge
Simple merge
Simple merge
Simple merge