diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
| commit | 837e9dcade7e0c60d61f1917fd5a2ec29e22b364 (patch) | |
| tree | cf6ea5d2a2a28146c2e673cae63338adc536e8c4 /source/blender/editors/render/SConscript | |
| parent | 10bf807574df6c96becd743544d19e3cda10bf66 (diff) | |
| parent | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (diff) | |
Merged changes to revision 25007.
The following files were according to the Math Lib reorganization
(see the commit log of revision 24464 for more information):
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
The file release/scripts/ui/properties_render.py was also updated
according the RNA UI API renaming in revision 24795.
Diffstat (limited to 'source/blender/editors/render/SConscript')
| -rw-r--r-- | source/blender/editors/render/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index ab1c0d11691..5f5f5138d06 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc ../../gpu ../../freestyle' +incs += ' ../../gpu ../../freestyle' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' incs += ' ../../blenloader' |