Merged changes in the trunk up to revision 36199.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 17 Apr 2011 14:20:43 +0000 (14:20 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 17 Apr 2011 14:20:43 +0000 (14:20 +0000)
commit2497af95a11122e6c30d42dd7bff5d8f239269ac
treed1742cdefe4dd2cc6462aafd28659fe7c5759f2d
parent4bb277117f08bf4dd45e8911272f5162e1de8ad1
parent0862abf68bf1c9601080d4fb142c8f7edc6b300f
Merged changes in the trunk up to revision 36199.
13 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c