diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
| commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
| tree | a86991622fa5582498612cf348d0de58af048a08 /source/blender/nodes/SConscript | |
| parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
| parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) | |
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
Diffstat (limited to 'source/blender/nodes/SConscript')
| -rw-r--r-- | source/blender/nodes/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 5f7f29dab83..5104bcd0046 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -4,6 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') sources += env.Glob('intern/CMP_nodes/*.c') sources += env.Glob('intern/SHD_nodes/*.c') +sources += env.Glob('intern/TEX_nodes/*.c') incs = '. ./intern ' incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna' |