svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00
parent a96c3ce9e0 77c5160791
commit 121ff4223d
366 changed files with 72305 additions and 242 deletions
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -12,7 +12,6 @@ SConscript(['avi/SConscript',
            'editors/SConscript',
            'imbuf/SConscript',
            'makesdna/SConscript',
-            'makesrna/SConscript',
            'render/SConscript',
            'nodes/SConscript',
            'modifiers/SConscript',
@@ -20,7 +19,7 @@ SConscript(['avi/SConscript',
            'windowmanager/SConscript',
            'blenfont/SConscript'])

-
+makesrna = SConscript('makesrna/SConscript')

 if env['WITH_BF_PYTHON']:
    SConscript(['python/SConscript'])