Merged changes in the trunk up to revision 40096.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Sep 2011 13:36:27 +0000 (13:36 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Sep 2011 13:36:27 +0000 (13:36 +0000)
commit353713afe827610501f0123b44b0054f49bf56ed
treede966b9d426b06708e37ad647a145e0940e4f535
parentfce87339750d50303f8b0324d88b517a10b76d52
parent322dbc9a0fa7d0e1c82fa2968728cbfc5c536445
Merged changes in the trunk up to revision 40096.

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt

Note for branch builders: Enabling Blender Player may cause linker errors.
20 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt