Merged changes in the trunk up to revision 26533.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Feb 2010 20:47:23 +0000 (20:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Feb 2010 20:47:23 +0000 (20:47 +0000)
commit18a2b9940e5b74475ab72359271656e7117aa9a2
tree845c784b911f5a728cf2d55594b10ccc9ccd1cbd
parent107667d20a15593f5c94437cc57fe786bcb92f7a
parent58b89bbac30a65ae8a7bc0f2063422670e3ec0b1
Merged changes in the trunk up to revision 26533.
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/python/CMakeLists.txt
source/blender/python/intern/bpy_interface.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c