diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-18 04:51:25 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-18 04:51:25 +0400 |
commit | 10f0f66560234a04aed3295c74fff20adacbc57f (patch) | |
tree | ab71d5b6cf00920c59f3c75209157cefe4f97894 /source/blender/freestyle/FRS_freestyle.h | |
parent | 62751e0da01ff22c73d5ab712e58c7224df63753 (diff) |
Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,
spaces around operators, and so forth). Many thanks!
Diffstat (limited to 'source/blender/freestyle/FRS_freestyle.h')
-rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 97 |
1 files changed, 50 insertions, 47 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 4fff1615e18..ece51d20048 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -1,5 +1,4 @@ -/* FRS_freestyle.h - * +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -26,59 +25,63 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef FRS_FREESTYLE_H -#define FRS_FREESTYLE_H +#ifndef __FRS_FREESTYLE_H__ +#define __FRS_FREESTYLE_H__ + +/** \file blender/freestyle/FRS_freestyle.h + * \ingroup freestyle + */ #ifdef __cplusplus extern "C" { -#endif - - #include "DNA_listBase.h" - #include "DNA_scene_types.h" - - #include "BKE_context.h" - #include "BKE_object.h" - - struct Render; - - extern Scene *freestyle_scene; - extern float freestyle_viewpoint[3]; - extern float freestyle_mv[4][4]; - extern float freestyle_proj[4][4]; - extern int freestyle_viewport[4]; +#endif + +#include "DNA_listBase.h" +#include "DNA_scene_types.h" + +#include "BKE_context.h" +#include "BKE_object.h" - // Rendering - void FRS_initialize(void); - void FRS_set_context(bContext* C); - void FRS_read_file(bContext* C); - int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl); - void FRS_init_stroke_rendering(struct Render* re); - struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl); - 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); - - // Panel configuration - 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); - - 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); +struct Render; - 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); +extern Scene *freestyle_scene; +extern float freestyle_viewpoint[3]; +extern float freestyle_mv[4][4]; +extern float freestyle_proj[4][4]; +extern int freestyle_viewport[4]; - void FRS_unlink_target_object(FreestyleConfig *config, struct Object *ob); +/* Rendering */ +void FRS_initialize(void); +void FRS_set_context(bContext* C); +void FRS_read_file(bContext* C); +int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl); +void FRS_init_stroke_rendering(struct Render* re); +struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl); +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); + +/* Panel configuration */ +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); + +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 -#endif +#endif // __FRS_FREESTYLE_H__ |