Merged changes in the trunk up to revision 28911.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 21 May 2010 22:01:47 +0000 (22:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 21 May 2010 22:01:47 +0000 (22:01 +0000)
13 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index 5de7ea0652d4cc80d0c8a206b9407e6927dd1fa1,aa42c2f8a4abd7182045bdb04046731e30c7cba3..69aa68acdc9d03a2490fa33f8daa3ae66ce45b43
@@@ -342,10 -340,30 +347,31 @@@ def rna2sphinx(BASEPATH)
      
      # C modules
      fw("   bpy.props.rst\n\n")
-     
+     fw("==================\n")
+     fw("Standalone Modules\n")
+     fw("==================\n")
+     fw("\n")
+     fw(".. toctree::\n")
+     fw("   :maxdepth: 1\n\n")
      fw("   mathutils.rst\n\n")
 +    fw("   Freestyle.rst\n\n")
      fw("   blf.rst\n\n")
+     
+     # game engine
+     fw("===================\n")
+     fw("Game Engine Modules\n")
+     fw("===================\n")
+     fw("\n")
+     fw(".. toctree::\n")
+     fw("   :maxdepth: 1\n\n")
+     fw("   bge.types.rst\n\n")
+     fw("   bge.logic.rst\n\n")
+     fw("   bge.render.rst\n\n")
+     fw("   bge.events.rst\n\n")
      file.close()
  
  
Simple merge
Simple merge
Simple merge