diff options
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/SConscript | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1afae47e21f..f75ac300086 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -43,6 +43,7 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc ../blender/render/extern/include ../blender/makesdna ../blender/gpu + ../blender/freestyle ../blender/windowmanager ../kernel/gen_messaging ../kernel/gen_system @@ -359,6 +360,7 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(BLENDER_SORTED_LIBS bf_windowmanager bf_editors + bf_freestyle bf_decimation blender_BSP bf_ghost diff --git a/source/creator/SConscript b/source/creator/SConscript index 8c71e0e8566..da32370ad74 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -8,7 +8,7 @@ incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel' incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf' incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager' incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging' -incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu' +incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu ../blender/freestyle' incs += ' ' + env['BF_OPENGL_INC'] defs = [] diff --git a/source/creator/creator.c b/source/creator/creator.c index 906f6e67a84..929a3ff0655 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -90,6 +90,8 @@ #include "GPU_draw.h" #include "GPU_extensions.h" +#include "FRS_freestyle.h" + /* for passing information between creator and gameengine */ #include "SYS_System.h" @@ -1022,6 +1024,10 @@ int main(int argc, char **argv) printf("Example: setenv BF_TIFF_LIB /usr/lib/libtiff.so\n"); } + /* initialize Freestyle */ + FRS_initialize(); + FRS_set_context(C); + /* OK we are ready for it */ BLI_argsParse(ba, 4, load_file, C); |