Merged changes in the trunk up to revision 52815.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 8 Dec 2012 12:35:14 +0000 (12:35 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 8 Dec 2012 12:35:14 +0000 (12:35 +0000)
15 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c

Simple merge
@@@ -1545,9 -1539,9 +1547,9 @@@ def write_rst_contents(basepath)
          # mathutils
          "mathutils", "mathutils.geometry", "mathutils.noise",
          # misc
 -        "bgl", "blf", "gpu", "aud", "bpy_extras",
 +        "Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras",
-         # bmesh
-         "bmesh", "bmesh.types", "bmesh.utils", "bmesh.ops",
+         # bmesh, submodules are in own page
+         "bmesh",
          )
  
      for mod in standalone_modules:
Simple merge
Simple merge
Simple merge