diff --git a/ArchitectureColoredPainting/src/MainWindow.cpp b/ArchitectureColoredPainting/src/MainWindow.cpp index c144e7c..0f1e3cb 100644 --- a/ArchitectureColoredPainting/src/MainWindow.cpp +++ b/ArchitectureColoredPainting/src/MainWindow.cpp @@ -32,6 +32,8 @@ CentralWidget::CentralWidget(QWidget* parent) : QWidget(parent) ui.stackedWidget->setCurrentWidget(ui.editorWidget); ui.editorWidget->handleOpenPaintingFile(path); }); + //navigationBarWidget->tabs->setCurrentTab(2); + //navigationBarWidget->hide(); } CentralWidget::~CentralWidget() diff --git a/ArchitectureColoredPainting/src/Renderer/Model.cpp b/ArchitectureColoredPainting/src/Renderer/Model.cpp index 57dffde..97be668 100644 --- a/ArchitectureColoredPainting/src/Renderer/Model.cpp +++ b/ArchitectureColoredPainting/src/Renderer/Model.cpp @@ -231,11 +231,13 @@ GLuint Model::loadMaterialTextures(aiMaterial* mat, aiTextureType type) if (iter != texturesLoaded.end()) return iter->second.textureId(); - QImage data(directory.filePath(path.c_str())); + auto qPath = QString::fromUtf8(QByteArray::fromPercentEncoding(path.c_str())); + //qDebug() << qPath; + //qDebug() << "Loading" << str.C_Str(); + QImage data(directory.filePath(qPath)); if (data.isNull()) return 0; - //qDebug() << "Loading" << path.c_str(); auto [it, _] = texturesLoaded.emplace(path, QOpenGLTexture::Target2D); auto& texture = it->second; texture.create();