merged changes to revision 23620
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 4 Oct 2009 01:21:33 +0000 (01:21 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 4 Oct 2009 01:21:33 +0000 (01:21 +0000)
commitef6f7bbedbb3eb826c94fab17bb84955a0f695e3
tree5927472c8880f3d8c7c591e5246d22ee6bd31f21
parentca347a1a3d2690e74fc1a36510efa1b793c2a35c
parentf82847687e413bf7627e424ad9f1a79bfea887cb
merged changes to revision 23620
source/blender/blenkernel/intern/scene.c
source/blender/makesdna/DNA_scene_types.h
source/blender/python/intern/bpy_interface.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c