diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
| commit | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (patch) | |
| tree | 8cf8bf458d14a26849dbee6af312ff9361029b90 /source/blender/render/SConscript | |
| parent | e9eed190e83eb351aeb435d21287eaf37fcffeb0 (diff) | |
| parent | e09ab8883ce0e41add94058ecd4045ac5efa74c6 (diff) | |
Merged changes in the trunk up to revision 44797.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 5af2bf05ef3..46e483a7194 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -5,7 +5,7 @@ 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 += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf ../blenfont' incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh' incs += ' ../freestyle' |