diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-01 04:11:15 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-01 04:11:15 +0300 |
commit | cdb84534e5b9edd044cb015acd39cd19fb304163 (patch) | |
tree | 208f13b50bcf2ecd742f91ee6c5bbcc5891af802 /source/blender/freestyle/FRS_freestyle.h | |
parent | d56a0fd72d58bc2504bfe43cbe3db8c3d4c226f4 (diff) |
* Removed a back pointer to a Scene (the "current" scene as in Blender
2.4x) from within Freestyle. Now Freestyle configuration parameters
are edited without relying on the notion of the current scene. This
resolved a few related issues as described below:
- A bug in Freestyle configuration management with respect to
multiple scenes was fixed. Now Freestyle configuration parameters
(e.g., style modules, ridges/valleys, suggestive contours) can be
specified for each render layer of each scene. Composition of
multiple render layers from different scenes should work as expected.
- A crash after undoing was fixed as well.
* Removed unused external Freestyle functions and global variables
from FRS_freestyle.h and FRS_freestyle.cpp.
Diffstat (limited to 'source/blender/freestyle/FRS_freestyle.h')
-rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 96696b9cc1f..73aae416819 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -10,32 +10,21 @@ extern "C" { #include "BKE_context.h" - extern short freestyle_is_initialized; - extern float freestyle_viewpoint[3]; extern float freestyle_mv[4][4]; extern float freestyle_proj[4][4]; extern int freestyle_viewport[4]; - extern char* freestyle_current_module_path; - extern SceneRenderLayer* freestyle_current_layer; - extern ListBase* freestyle_modules; - extern int* freestyle_flags; - extern float* freestyle_sphere_radius; - extern float* freestyle_dkr_epsilon; - // Rendering void FRS_initialize(bContext* C); void FRS_add_Freestyle( struct Render* re); void FRS_exit(); // Panel configuration - void FRS_select_layer( SceneRenderLayer* srl ); - void FRS_add_module(); - void FRS_delete_module(void *module_index_ptr, void *unused); - void FRS_move_up_module(void *module_index_ptr, void *unused); - void FRS_move_down_module(void *module_index_ptr, void *unused); - void FRS_set_module_path(void *module_index_ptr, void *unused); + void FRS_add_module(FreestyleConfig *config); + void FRS_delete_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf); + void FRS_move_up_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf); + void FRS_move_down_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf); #ifdef __cplusplus } |