diff --git a/doomsday/libdeng2/src/filesys/file.cpp b/doomsday/libdeng2/src/filesys/file.cpp index a00d98f2e4..4d60fd007f 100644 --- a/doomsday/libdeng2/src/filesys/file.cpp +++ b/doomsday/libdeng2/src/filesys/file.cpp @@ -338,6 +338,9 @@ File *File::reinterpret() original->flush(); result = fileSystem().interpret(original); + // The interpreter should use whatever origin feed the file was previously using. + result->setOriginFeed(d->originFeed); + if(deleteThis) { DENG2_ASSERT(result != this); diff --git a/doomsday/libgui/include/de/gui/atlas.h b/doomsday/libgui/include/de/gui/atlas.h index b7c40a6de2..21c8aa2ba4 100644 --- a/doomsday/libgui/include/de/gui/atlas.h +++ b/doomsday/libgui/include/de/gui/atlas.h @@ -67,6 +67,13 @@ class LIBGUI_PUBLIC Atlas : public Lockable */ WrapBordersInBackingStore = 0x4, + /** + * All commits are logged as XVerbose log entries. A commit occurs when the + * atlas backing store contents are copied to the actual atlas storage (for + * instance a GL texture). + */ + LogCommitsAsXVerbose = 0x8, + DefaultFlags = 0 }; Q_DECLARE_FLAGS(Flags, Flag) diff --git a/doomsday/libgui/src/atlas.cpp b/doomsday/libgui/src/atlas.cpp index 2172b38ccb..23bba89e3c 100644 --- a/doomsday/libgui/src/atlas.cpp +++ b/doomsday/libgui/src/atlas.cpp @@ -406,13 +406,18 @@ void Atlas::commit() const if(d->mustCommitFull()) { DENG2_ASSERT(d->backing.size() == d->totalSize); - LOGDEV_GL_XVERBOSE("Full commit ") << d->backing.size().asText(); - + if(d->flags.testFlag(LogCommitsAsXVerbose)) + { + LOGDEV_GL_XVERBOSE("Full commit ") << d->backing.size().asText(); + } commitFull(d->backing); } else { - LOGDEV_GL_XVERBOSE("Partial commit ") << d->changedArea.asText(); + if(d->flags.testFlag(LogCommitsAsXVerbose)) + { + LOGDEV_GL_XVERBOSE("Partial commit ") << d->changedArea.asText(); + } // An extra copy is done to crop to the changed area. commit(d->backing.subImage(d->changedArea), d->changedArea.topLeft);