[Bf-blender-cvs] [2dfeb25c54d] master: Cleanup: remove unused PYTHONPATH from freestyle

[Campbell Barton]

Commit: 2dfeb25c54d1e3aa346393f016d0e16dfea52199
Author: Campbell Barton
Date:   Thu Jan 16 21:04:09 2020 +1100
Branches: master
https://developer.blender.org/rB2dfeb25c54d1e3aa346393f016d0e16dfea52199

Cleanup: remove unused PYTHONPATH from freestyle

This accesses PYTHONPATH directly, ignoring Py_IgnoreEnvironmentFlag.
Remove since it's not used.

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

M	source/blender/freestyle/intern/application/AppConfig.cpp
M	source/blender/freestyle/intern/application/AppConfig.h

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

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;