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)
13 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge