Merge remote-tracking branch 'remotes/origin/master' into savegame-re…

…factor
skyjake · Mar 26, 2014 · 0124ff3 · 0124ff3
2 parents a83f621 + 82c07ef
commit 0124ff3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);