diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-01 17:34:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-01 17:34:56 +0400 |
| commit | 04cbb3ad149563035e6606db48040e4ef00f1762 (patch) | |
| tree | e2de26a82133a1d4e22185c81a7777fbba98a83b /source/blender/freestyle/intern/application/Controller.cpp | |
| parent | 8843eb906388f9b014458f24bffb690a34ab4e5f (diff) | |
Fix for [#35116] Freestyle StringUtils::toAscii breakes non-ascii path values.
Just removed all calls of StringUtils::toAscii() as well as the function definitions.
Diffstat (limited to 'source/blender/freestyle/intern/application/Controller.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index aaa8542d63b..7303ccc95f3 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -280,7 +280,7 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) char cleaned[FILE_MAX]; BLI_strncpy(cleaned, iFileName, FILE_MAX); BLI_cleanup_file(NULL, cleaned); - string basename = StringUtils::toAscii(string(cleaned)); + string basename = string(cleaned); #endif _ListOfModels.push_back("Blender_models"); @@ -851,7 +851,7 @@ Render *Controller::RenderStrokes(Render *re) void Controller::InsertStyleModule(unsigned index, const char *iFileName) { if (!BLI_testextensie(iFileName, ".py")) { - cerr << "Error: Cannot load \"" << StringUtils::toAscii(string(iFileName)) << "\", unknown extension" << endl; + cerr << "Error: Cannot load \"" << string(iFileName) << "\", unknown extension" << endl; return; } @@ -1015,10 +1015,10 @@ void Controller::init_options() Config::Path * cpath = Config::Path::getInstance(); // Directories - ViewMapIO::Options::setModelsPath(StringUtils::toAscii(cpath->getModelsPath())); - PythonInterpreter::Options::setPythonPath(StringUtils::toAscii(cpath->getPythonPath())); - TextureManager::Options::setPatternsPath(StringUtils::toAscii(cpath->getPatternsPath())); - TextureManager::Options::setBrushesPath(StringUtils::toAscii(cpath->getModelsPath())); + ViewMapIO::Options::setModelsPath(cpath->getModelsPath()); + PythonInterpreter::Options::setPythonPath(cpath->getPythonPath()); + TextureManager::Options::setPatternsPath(cpath->getPatternsPath()); + TextureManager::Options::setBrushesPath(cpath->getModelsPath()); // ViewMap Format ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS); |