Merged changes in the trunk up to revision 51718.

Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/makesrna/intern/rna_scene.c release/datafiles/startup.blend
2012-10-29 01:09:12 +00:00
parent 5acd5d1497 dd106b5c7a
commit 15ed834343
1082 changed files with 18699 additions and 18608 deletions
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -900,7 +900,6 @@ endif()
 		bf_imbuf_dds
 		bf_collada
 		bf_intern_bsp
-		bf_intern_decimate
 		bf_intern_elbeem
 		bf_intern_memutil
 		bf_intern_guardedalloc