diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-15 23:23:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-15 23:23:35 +0400 |
| commit | ef6eab3ce4519a07041d7321b7c5775b1d1870f3 (patch) | |
| tree | 75d9a5b7cc2ddb976552b979eaa42d2c4f9e1adf /intern/cycles/SConscript | |
| parent | c7ec8a2e54b7557a5f0f96a35c1c05402dee95b9 (diff) | |
Cycles: move clew into cycles namespace to avoid conflicts, and fix mesh
displacement panel showing with blender internal.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 1acb7321f09..4d45a6875a9 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -6,7 +6,7 @@ cycles = env.Clone() cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h', 'makesrna') -sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('util/*.c') + cycles.Glob('blender/*.cpp') +sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('blender/*.cpp') sources.remove(path.join('util', 'util_view.cpp')) sources.remove(path.join('render', 'film_response.cpp')) |