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/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/CMakeLists.txt') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 14d5a2cca0c..7e327028a01 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -43,6 +43,7 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_dynamicpaint_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_effect_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fileglobal_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_freestyle_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_genfile.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_group_types.h @@ -51,6 +52,7 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h @@ -140,9 +142,6 @@ if(WITH_OPENCOLLADA) endif() if(WITH_FREESTYLE) - list(APPEND SRC_DNA_INC - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h - ) add_subdirectory(freestyle) endif() -- cgit v1.2.3