diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
| commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
| tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/blender/SConscript | |
| parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
| parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) | |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index e6cd6b09c20..c3a7089f425 100644 --- 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']) |