Merged changes in the trunk up to revision 34670.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Feb 2011 18:05:05 +0000 (18:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Feb 2011 18:05:05 +0000 (18:05 +0000)
19 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c

index 7cf286b5ac1a5ee0972cf078066dd05a4511a632,22655498a635e0b79454a5cf5119aa8a26e6ce55..b1437c60bf6f817acbb5a58e67d6cb1267655864
@@@ -414,9 -409,7 +416,8 @@@ def rna2sphinx(BASEPATH)
      fw(".. toctree::\n")
      fw("   :maxdepth: 1\n\n")
  
      fw("   mathutils.rst\n\n")
 +    fw("   Freestyle.rst\n\n")
      fw("   mathutils.geometry.rst\n\n")
      # XXX TODO
      #fw("   bgl.rst\n\n")
Simple merge
Simple merge
Simple merge
Simple merge