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/freestyle/FRS_freestyle.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'source/blender/freestyle/FRS_freestyle.h') diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 5b2b62818c1..1759d394664 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -40,7 +40,6 @@ extern "C" { #include "DNA_scene_types.h" #include "BKE_context.h" -#include "BKE_object.h" struct Render; @@ -61,28 +60,13 @@ void FRS_finish_stroke_rendering(struct Render *re); void FRS_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render); void FRS_exit(void); -/* FreestyleConfig.modules */ -FreestyleModuleConfig *FRS_alloc_module(void); -void FRS_add_module(FreestyleConfig *config); -void FRS_delete_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf); -void FRS_move_module_up(FreestyleConfig *config, FreestyleModuleConfig *module_conf); -void FRS_move_module_down(FreestyleConfig *config, FreestyleModuleConfig *module_conf); - /* FreestyleConfig.linesets */ -FreestyleLineSet *FRS_alloc_lineset(void); -FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config); void FRS_copy_active_lineset(FreestyleConfig *config); void FRS_paste_active_lineset(FreestyleConfig *config); void FRS_delete_active_lineset(FreestyleConfig *config); void FRS_move_active_lineset_up(FreestyleConfig *config); void FRS_move_active_lineset_down(FreestyleConfig *config); -FreestyleLineSet *FRS_get_active_lineset(FreestyleConfig *config); -short FRS_get_active_lineset_index(FreestyleConfig *config); -void FRS_set_active_lineset_index(FreestyleConfig *config, short index); - -void FRS_unlink_target_object(FreestyleConfig *config, struct Object *ob); - #ifdef __cplusplus } #endif -- cgit v1.2.3