Merged changes in the trunk up to revision 36551.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 9 May 2011 01:38:29 +0000 (01:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 9 May 2011 01:38:29 +0000 (01:38 +0000)
commit31471f644cb9d9c3b88da1977705724649482a82
tree46b5c62b475108e1b1a501a21e53846531ead116
parentb1db37dd056d1b2a16e82f1374163de566c2fe10
parentf8f4f73cc5e6dfdc2a4f8864a3e1edc2639e6fb2
Merged changes in the trunk up to revision 36551.

Conflicts resolved:
source/creator/SConscript
18 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c