SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@376 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2018-04-22 18:17:42 +00:00
parent 11302ac363
commit 0f6c46f9c0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglview/glmaterial.cpp
View File

@@ -134,7 +134,7 @@ GLuint GLTextureManagerBase::loadTexture(const QImage & im, bool ownership, bool
void GLTextureManagerBase::reloadTexture(GLuint tid, const QString & path) { void GLTextureManagerBase::reloadTexture(GLuint tid, const QString & path) {
if (!currentGLTextureManager) return; if (!currentGLTextureManager) return;
QString p = findFile(path); QString p = findFile(path);
if (p.isEmpty()) return; if (p.isEmpty() || (tid == 0)) return;
QImage image(p); QImage image(p);
createGLTexture(tid, image); createGLTexture(tid, image);
if (tid == 0) { if (tid == 0) {
@@ -147,7 +147,7 @@ void GLTextureManagerBase::reloadTexture(GLuint tid, const QString & path) {
void GLTextureManagerBase::reloadTexture(GLuint tid, const QImage & im) { void GLTextureManagerBase::reloadTexture(GLuint tid, const QImage & im) {
if (!currentGLTextureManager) return; if (!currentGLTextureManager) return;
if (im.isNull()) return; if (im.isNull() || (tid == 0)) return;
QImage image(im); QImage image(im);
createGLTexture(tid, image); createGLTexture(tid, image);
qDebug() << "[TextureManager] Reloaded" << tid; qDebug() << "[TextureManager] Reloaded" << tid;