Cycles: svn merge -r40358:40411 ^/trunk/blender

2011-09-20 18:48:28 +00:00
parent 153e4cad4b 0af633a36c
commit a2c6db0b44
252 changed files with 12888 additions and 3488 deletions
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -47,6 +47,7 @@ set(SRC
 	bpy_app_handlers.c
 	bpy_driver.c
 	bpy_interface.c
+	bpy_interface_atexit.c
 	bpy_intern_string.c
 	bpy_library.c
 	bpy_operator.c