diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
| commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
| tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/render/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 479c9d1ad40..d471025c7da 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,11 @@ raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' +<<<<<<< .working incs += ' ../include ../blenloader ../../../intern/smoke/extern ../bmesh' +======= +incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace' +>>>>>>> .merge-right.r35190 cflags_raytrace = env['CCFLAGS'] cxxflags_raytrace = env['CXXFLAGS'] |