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/makesrna/intern/CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'source/blender/makesrna/intern/CMakeLists.txt') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 0375868915b..609592cc1cd 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -54,6 +54,7 @@ set(DEFSRC rna_key.c rna_lamp.c rna_lattice.c + rna_linestyle.c rna_main.c rna_mask.c rna_material.c @@ -93,12 +94,6 @@ set(DEFSRC rna_world.c ) -if(WITH_FREESTYLE) - list(APPEND DEFSRC - rna_linestyle.c - ) -endif() - set(APISRC rna_action_api.c rna_actuator_api.c @@ -277,9 +272,7 @@ blender_include_dirs( ) if(WITH_FREESTYLE) - blender_include_dirs( - ../../freestyle - ) + # TO BE REMOVED when the trunk merger is done add_definitions(-DWITH_FREESTYLE) endif() -- cgit v1.2.3