[Bf-blender-cvs] [2c00470] master: Freestyle: code cleanup: removed unused (outdated) static variables.

Tamito Kajiyama noreply at git.blender.org
Thu Jun 26 05:23:24 CEST 2014


Commit: 2c004708f243fa8a1c27fdd1122ae63c8d832fee
Author: Tamito Kajiyama
Date:   Thu Jun 26 12:12:50 2014 +0900
https://developer.blender.org/rB2c004708f243fa8a1c27fdd1122ae63c8d832fee

Freestyle: code cleanup: removed unused (outdated) static variables.

===================================================================

M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp

===================================================================

diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 4d60b54..1690e67 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -67,7 +67,6 @@ extern "C" {
 
 // Freestyle configuration
 static bool freestyle_is_initialized = false;
-static Config::Path *pathconfig = NULL;
 static Controller *controller = NULL;
 static AppView *view = NULL;
 
@@ -84,8 +83,6 @@ int freestyle_viewport[4];
 // current scene
 Scene *freestyle_scene;
 
-static string default_module_path;
-
 static void load_post_callback(struct Main *main, struct ID *id, void *arg)
 {
 	lineset_copied = false;
@@ -107,7 +104,6 @@ void FRS_initialize()
 	if (freestyle_is_initialized)
 		return;
 
-	pathconfig = new Config::Path;
 	controller = new Controller();
 	view = new AppView;
 	controller->setView(view);
@@ -115,9 +111,6 @@ void FRS_initialize()
 	freestyle_scene = NULL;
 	lineset_copied = false;
 
-	default_module_path = pathconfig->getProjectDir() + Config::DIR_SEP + "style_modules" +
-	                      Config::DIR_SEP + "contour.py";
-
 	BLI_callback_add(&load_post_callback_funcstore, BLI_CB_EVT_LOAD_POST);
 
 	freestyle_is_initialized = 1;
@@ -133,7 +126,6 @@ void FRS_set_context(bContext *C)
 
 void FRS_exit()
 {
-	delete pathconfig;
 	delete controller;
 	delete view;
 }




More information about the Bf-blender-cvs mailing list