projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender-staging.git]
/
source
/
blender
/
SConscript
diff --git
a/source/blender/SConscript
b/source/blender/SConscript
index ea5101f811110ff08d48cff99a450243e8efe895..c3a7089f425659874bdd047c11b904d38bc2689f 100644
(file)
--- a/
source/blender/SConscript
+++ b/
source/blender/SConscript
@@
-3,6
+3,7
@@
Import ('env')
import sys
SConscript(['avi/SConscript',
+ 'bmesh/SConscript',
'blenkernel/SConscript',
'blenlib/SConscript',
'blenloader/SConscript',