Fixed a bug that the parameter panel did not correctly work when

a new file was created or an existing file was loaded.

1 files changed, 12 insertions, 8 deletions

diff --git a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
index c65d71452a7..34e6e31a177 100644
--- a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
@@ -83,17 +83,22 @@ extern "C" {
 			controller = new Controller;
 			view = new AppView;
 			controller->setView(view);
+
+		} else {
+
+			delete panelConfig;
+
+		}
+
+		panelConfig = new FreestylePanelConfigurationData;
 			
-			panelConfig = new FreestylePanelConfigurationData;
-			
-			default_module_path = pathconfig->getProjectDir() + Config::DIR_SEP + "style_modules" + Config::DIR_SEP + "contour.py";
-			FRS_select_layer( (SceneRenderLayer*) BLI_findlink(&G.scene->r.layers, G.scene->r.actlay) );
+		default_module_path = pathconfig->getProjectDir() + Config::DIR_SEP + "style_modules" + Config::DIR_SEP + "contour.py";
+		FRS_select_layer( (SceneRenderLayer*) BLI_findlink(&G.scene->r.layers, G.scene->r.actlay) );
 			
-			freestyle_is_initialized = 1;
-		}
+		freestyle_is_initialized = 1;
 		
 	}
-	
+
 	void FRS_exit() {
 		delete pathconfig;
 		delete controller;
@@ -252,7 +257,6 @@ extern "C" {
 		cout << "#  Freestyle" << endl;
 		cout << "#===============================================================" << endl;
 		
-		FRS_initialize();
 		init_view(re);
 		init_camera(re);