Merged changes in the trunk up to revision 52815.
[blender-staging.git] / source / blender / blenkernel / CMakeLists.txt
index 2da9b402d59245f2f0ccddbc19df2a56e350b3a4..6208bb355b1a186d73509394a69241030425e134 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../blenfont
        ../blenlib
        ../blenloader
+       ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
@@ -101,8 +102,8 @@ set(SRC
        intern/lamp.c
        intern/lattice.c
        intern/library.c
-       intern/mask_evaluate.c
-       intern/mask_rasterize.c
+       intern/linestyle.c
+       intern/mask_evaluate.c  intern/mask_rasterize.c
        intern/mask.c
        intern/material.c
        intern/mball.c
@@ -193,6 +194,7 @@ set(SRC
        BKE_lamp.h
        BKE_lattice.h
        BKE_library.h
+       BKE_linestyle.h
        BKE_main.h
        BKE_mask.h
        BKE_material.h