From ef11c4e8e744cbd64895f27a1f26636cc5c2b047 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 18 Jul 2009 18:33:07 +0000 Subject: Fixed a bug that the parameter panel did not correctly work when a new file was created or an existing file was loaded. --- .../freestyle/intern/app_blender/FRS_freestyle.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'source/blender/freestyle/intern') 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); -- cgit v1.2.3