svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00
parent 87a3477200 ac498a6b64
commit 4ced91da47
116 changed files with 2071 additions and 737 deletions
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -776,11 +776,11 @@ endif()
 		bf_nodes
 		bf_gpu
 		bf_blenloader
+		bf_imbuf
 		bf_blenlib
 		bf_intern_ghost
 		bf_intern_string
 		bf_blenpluginapi
-		bf_imbuf
 		bf_avi
 		bf_imbuf_cineon
 		bf_imbuf_openexr