From 62cede96d34d802d97797a635ff8370a5f7556a1 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 23 Mar 2013 03:00:37 +0000 Subject: A major code update for making the DNA file specification of Freestyle settings and RNA for it independent of the build flag for enabling Freestyle. Suggested by Sergey Sharybin through a code review of the branch. * Many #ifdef WITH_FREESTYLE blocks were removed to always have Freestyle-specific DNA file specification and RNA for it built in Blender. This will allow Freestyle setting survive even when a non-Freestyle build is used for loading and saving files. It is noted that operations are still conditionally built through #ifdef WITH_FREESTYLE blocks. * To this end, new blenkernel files BKE_freestyle.h and intern/freestyle.c have been added. All API functions in FRS_freestyle_config.h as well as some of those in FRS_freestyle.h were moved to the new files. Now the relocated API functions have BKE_ prefix instead of FRS_. --- source/blender/blenkernel/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'source/blender/blenkernel/CMakeLists.txt') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 599296f54a5..57e99481604 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -90,6 +90,7 @@ set(SRC intern/fluidsim.c intern/fmodifier.c intern/font.c + intern/freestyle.c intern/gpencil.c intern/group.c intern/icons.c @@ -103,6 +104,7 @@ set(SRC intern/lamp.c intern/lattice.c intern/library.c + intern/linestyle.c intern/mask.c intern/mask_evaluate.c intern/mask_rasterize.c @@ -188,6 +190,7 @@ set(SRC BKE_fcurve.h BKE_fluidsim.h BKE_font.h + BKE_freestyle.h BKE_global.h BKE_gpencil.h BKE_group.h @@ -200,6 +203,7 @@ set(SRC BKE_lamp.h BKE_lattice.h BKE_library.h + BKE_linestyle.h BKE_main.h BKE_mask.h BKE_material.h @@ -425,13 +429,6 @@ if(WITH_INTERNATIONAL) endif() if(WITH_FREESTYLE) - list(APPEND SRC - intern/linestyle.c - BKE_linestyle.h - ) - list(APPEND INC - ../freestyle - ) add_definitions(-DWITH_FREESTYLE) endif() -- cgit v1.2.3