From 04cbb3ad149563035e6606db48040e4ef00f1762 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 1 May 2013 13:34:56 +0000 Subject: Fix for [#35116] Freestyle StringUtils::toAscii breakes non-ascii path values. Just removed all calls of StringUtils::toAscii() as well as the function definitions. --- source/blender/freestyle/intern/application/AppCanvas.cpp | 2 +- source/blender/freestyle/intern/application/AppConfig.cpp | 7 +++---- source/blender/freestyle/intern/application/Controller.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) (limited to 'source/blender/freestyle/intern/application') diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp index e385eb76fbe..e1f300b3ce0 100644 --- a/source/blender/freestyle/intern/application/AppCanvas.cpp +++ b/source/blender/freestyle/intern/application/AppCanvas.cpp @@ -39,7 +39,7 @@ AppCanvas::AppCanvas() :Canvas() { _pViewer = 0; - _MapsPath = StringUtils::toAscii(Config::Path::getInstance()->getMapsDir()).c_str(); + _MapsPath = Config::Path::getInstance()->getMapsDir().c_str(); } AppCanvas::AppCanvas(AppView *iViewer) diff --git a/source/blender/freestyle/intern/application/AppConfig.cpp b/source/blender/freestyle/intern/application/AppConfig.cpp index 94bda945701..bf6a502c397 100644 --- a/source/blender/freestyle/intern/application/AppConfig.cpp +++ b/source/blender/freestyle/intern/application/AppConfig.cpp @@ -83,15 +83,14 @@ Path *Path::getInstance() string Path::getEnvVar(const string& iEnvVarName) { string value; - if (!getenv(StringUtils::toAscii(iEnvVarName).c_str())) { - cerr << "Warning: You may want to set the $" << - StringUtils::toAscii(iEnvVarName) << + if (!getenv(iEnvVarName.c_str())) { + cerr << "Warning: You may want to set the $" << iEnvVarName << " environment variable to use Freestyle." << endl << " Otherwise, the current directory will be used instead." << endl; value = "."; } else { - value = getenv(StringUtils::toAscii(iEnvVarName).c_str()); + value = getenv(iEnvVarName.c_str()); } return value; } 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); -- cgit v1.2.3