Merged changes in the trunk up to revision 32886.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 5 Nov 2010 21:49:36 +0000 (21:49 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 5 Nov 2010 21:49:36 +0000 (21:49 +0000)
commit43f4dbceb40e50740ad6d9da770ed4dcc707bdd1
treebe39f5d160aa806fbae621362ac8e26288c175ad
parentaa7575c0080c5ba86ff7f2127619400809063a14
parente8501edae25905b76b6ac602f70ac06a9082b1de
Merged changes in the trunk up to revision 32886.
27 files changed:
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c