Merged changes in the trunk up to revision 31630.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 28 Aug 2010 14:30:52 +0000 (14:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 28 Aug 2010 14:30:52 +0000 (14:30 +0000)
commit12f9a5de5b08812159bcedb53d64e2699476e7a8
treefdf37a83870d4d904051dd99323828ede1833e06
parentd8b2d1945a011b3ac66bac3d562cfb5bbb4a010c
parentf28b5e672ed05bb08b317c78a36b31e7c49d4f4e
Merged changes in the trunk up to revision 31630.
13 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt