Merge remote-tracking branch 'origin/RB-2.2'

MrKepzie · Jan 11, 2017 · a86aedf · a86aedf
1 parent 433f7c2
commit a86aedf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp
@@ -94,11 +94,11 @@ CLANG_DIAG_ON(unknown-pragmas)
 #include "Engine/AppInstance.h"
 #include "Engine/AppManager.h"
 #include "Engine/CreateNodeArgs.h"
+#include "Engine/FStreamsSupport.h"
 #include "Engine/KnobTypes.h"
 #include "Engine/LibraryBinary.h"
 #include "Engine/MemoryInfo.h" // printAsRAM
 #include "Engine/Node.h"
-#include "Engine/NodeSerialization.h"
 #include "Engine/OfxEffectInstance.h"
 #include "Engine/OfxImageEffectInstance.h"
 #include "Engine/OutputSchedulerThread.h"

diff --git a/Engine/OfxImageEffectInstance.cpp b/Engine/OfxImageEffectInstance.cpp
@@ -61,6 +61,9 @@ CLANG_DIAG_ON(uninitialized)
 #include "Engine/NodeMetadata.h"
 #include "Engine/ViewerInstance.h"
 #include "Engine/ViewerNode.h"
+#include "Engine/OfxClipInstance.h"
+#include "Engine/OfxEffectInstance.h"
+#include "Engine/OfxMemory.h"
 #include "Engine/OfxOverlayInteract.h"
 #include "Engine/OfxParamInstance.h"
 #include "Engine/Project.h"

diff --git a/Engine/Project.cpp b/Engine/Project.cpp
@@ -66,7 +66,6 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 
 #include "Global/StrUtils.h"
 #include "Global/GitVersion.h"
-#include "Global/MemoryInfo.h" // isApplication32Bits
 
 #include "Engine/AppInstance.h"
 #include "Engine/AppManager.h"
@@ -76,6 +75,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 #include "Engine/FStreamsSupport.h"
 #include "Engine/Hash64.h"
 #include "Engine/KnobFile.h"
+#include "Engine/MemoryInfo.h" // isApplication32Bits
 #include "Engine/Node.h"
 #include "Engine/OutputSchedulerThread.h"
 #include "Engine/ProjectPrivate.h"