From 2dfeb25c54d1e3aa346393f016d0e16dfea52199 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 16 Jan 2020 21:04:09 +1100 Subject: Cleanup: remove unused PYTHONPATH from freestyle This accesses PYTHONPATH directly, ignoring Py_IgnoreEnvironmentFlag. Remove since it's not used. --- source/blender/freestyle/intern/application/AppConfig.cpp | 4 ---- source/blender/freestyle/intern/application/AppConfig.h | 5 ----- 2 files changed, 9 deletions(-) (limited to 'source/blender/freestyle/intern') diff --git a/source/blender/freestyle/intern/application/AppConfig.cpp b/source/blender/freestyle/intern/application/AppConfig.cpp index 3e3a939a8fe..a2f0a3395af 100644 --- a/source/blender/freestyle/intern/application/AppConfig.cpp +++ b/source/blender/freestyle/intern/application/AppConfig.cpp @@ -53,10 +53,6 @@ void Path::setRootDir(const string &iRootDir) string(DIR_SEP.c_str()); _BrushesPath = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "textures" + string(DIR_SEP.c_str()) + "brushes" + string(DIR_SEP.c_str()); - _PythonPath = _ProjectDir + string(DIR_SEP.c_str()) + "modules" + string(DIR_SEP.c_str()); - if (getenv("PYTHONPATH")) { - _PythonPath += string(PATH_SEP.c_str()) + string(getenv("PYTHONPATH")); - } _EnvMapDir = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "env_map" + string(DIR_SEP.c_str()); _MapsDir = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "maps" + diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h index cc2a3962ecd..9369ed81d50 100644 --- a/source/blender/freestyle/intern/application/AppConfig.h +++ b/source/blender/freestyle/intern/application/AppConfig.h @@ -43,7 +43,6 @@ class Path { string _ModelsPath; string _PatternsPath; string _BrushesPath; - string _PythonPath; string _EnvMapDir; string _MapsDir; string _HomeDir; @@ -72,10 +71,6 @@ class Path { { return _BrushesPath; } - const string &getPythonPath() const - { - return _PythonPath; - } const string &getEnvMapDir() const { return _EnvMapDir; -- cgit v1.2.3