diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-15 19:15:43 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-15 19:15:43 +0400 |
| commit | f7c686d0ae68842feddd4f37deadab12e1fa4991 (patch) | |
| tree | 52773e6d6236aec9a3a80bf6c5c1ea5f7e943224 /source/blender/render/SConscript | |
| parent | f8657be654f89c6a4826ef8dd3e2275dfe2d4a5a (diff) | |
| parent | 0338b05a64184ce1a439a418ebc4e315185c1eec (diff) | |
svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 22800:23207 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merged volumetric with new raytrace code (it compiles and rendered volume-cube.blend withouth problems)
Part1:
source/blender
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 9c1dd385635..a15dada1bec 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -1,14 +1,14 @@ #!/usr/bin/python Import ('env') -cflags = ['-O3','-msse2','-mfpmath=sse'] -cxxflags = ['-O3','-msse2','-mfpmath=sse'] +cflags = ['-msse2','-mfpmath=sse'] +cxxflags = ['-msse2','-mfpmath=sse'] sources = env.Glob('intern/source/*.c') raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../include ../blenloader' +incs += ' ../include ../blenloader ../../../intern/smoke/extern' defs = [] |