diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/editors/space_file | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_file/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 98e147413ff..b30f008e1bf 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -82,4 +82,8 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_FREESTYLE) + add_definitions(-DWITH_FREESTYLE) +endif() + blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index c3f8c6667f7..6459f880bc4 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -48,6 +48,9 @@ if env['WITH_BF_TIFF']: if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_FREESTYLE']: + defs.append('WITH_FREESTYLE') + if env['OURPLATFORM'] == 'linux': cflags='-pthread' incs += ' ../../../extern/binreloc/include' diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 5b21ebf1742..142eb2214a1 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1162,7 +1162,11 @@ void filelist_from_main(struct FileList *filelist) if (filelist->dir[0] == 0) { /* make directories */ +#ifdef WITH_FREESTYLE filelist->numfiles = 25; +#else + filelist->numfiles = 24; +#endif filelist->filelist = (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry)); for (a = 0; a < filelist->numfiles; a++) { @@ -1193,7 +1197,9 @@ void filelist_from_main(struct FileList *filelist) filelist->filelist[21].relname = BLI_strdup("Action"); filelist->filelist[22].relname = BLI_strdup("NodeTree"); filelist->filelist[23].relname = BLI_strdup("Speaker"); +#ifdef WITH_FREESTYLE filelist->filelist[24].relname = BLI_strdup("FreestyleLineStyle"); +#endif filelist_sort(filelist, FILE_SORT_ALPHA); } else { |