diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
| commit | a5152b7ca0d6d7f340b1955c0e8a15ba23fda336 (patch) | |
| tree | 1b8289047b989964a442deb8f084a04d07f97b00 /source/blender/SConscript | |
| parent | 8925ed1420ea2557abc7867cf12f89730ef77718 (diff) | |
| parent | 65228807725d57aa4d33bcb8c3e3966d1acf0b8a (diff) | |
Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 95c9d0925b6..81e43273cfc 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -9,10 +9,12 @@ SConscript(['avi/SConscript', 'blenloader/SConscript', 'blenpluginapi/SConscript', 'gpu/SConscript', + 'opencl/SConscript', 'editors/SConscript', 'freestyle/SConscript', 'imbuf/SConscript', 'makesdna/SConscript', + 'compositor/SConscript', 'render/SConscript', 'nodes/SConscript', 'modifiers/SConscript', |