SUMMARY:

The main contribution of this commit is the possibility to save Freestyle configuration information inside .blend files. It required an extensive refactoring of the previous interface code.

The code has been tested and does not crash on my machine. If you encounter issues, please let me know (and if possible, sending me an sample .blend file).

DETAILS:
- refactored code to notify Freestyle when adding/removing render layers  (FRS_freestyle_config.{h,cpp})
- corrected the freeing of style modules when files are read from / written to disk
- moved Freestyle configuration information into scene renderlayers, to allow loading / saving .blend files (DNA_scene_types.h DNA_freestyle_types.h FRS_freestyle.cpp)
- inserted temporary trick to prevent crashes when orthographic camera is used (SilhouetteGeomEngine.cpp), but outputting incorrect feature line calculations

1 files changed, 4 insertions, 11 deletions

diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index d3ab042f84b..cc52685663c 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -8,13 +8,8 @@
 extern "C" {
 #endif	
 	
-	typedef struct StyleModuleConf {
-		struct StyleModuleConf *next, *prev;
-		
-		char module_path[255];
-		short is_displayed;
-	} StyleModuleConf;
-	
+	#include "DNA_listBase.h"
+	#include "DNA_scene_types.h"
 	
 	extern short freestyle_is_initialized;
 	
@@ -22,8 +17,7 @@ extern "C" {
 	extern float freestyle_mv[4][4];
 	extern float freestyle_proj[4][4];
 	extern int freestyle_viewport[4];
-	
-	extern short freestyle_current_layer_number;
+
 	extern char* freestyle_current_module_path;
 	extern SceneRenderLayer* freestyle_current_layer;
 	extern ListBase* freestyle_modules;
@@ -32,13 +26,12 @@ extern "C" {
 	extern float* freestyle_dkr_epsilon;
 	
 	// Rendering
-	void FRS_initialize();
+	void FRS_initialize( short select_layer );
 	void FRS_add_Freestyle(Render* re);
 	void FRS_exit();
 	
 	// Panel configuration
 	void FRS_select_layer( SceneRenderLayer* srl );
-	void FRS_delete_layer( SceneRenderLayer* srl, short isDestructor );
 	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);