svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender.git] / source / blender / SConscript
index e6cd6b09c2084a8a9f7aa6f36cb074f42b75f80f..c3a7089f425659874bdd047c11b904d38bc2689f 100644 (file)
@@ -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'])