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

Author: devernay

.gitignore

@@ -57,6 +57,7 @@ HostSupport.xcodeproj/
 Gui.xcodeproj/
 Engine.xcodeproj/
 Project.xcodeproj/
+natron-python.xcodeproj/
 *.sln
 *.xcworkspace
 *xcuserdata

Engine/Node.cpp

@@ -48,6 +48,7 @@
 
 #include <SequenceParsing.h>
 
+#include "Global/FStreamsSupport.h"
 
 #include "Engine/NodePrivate.h"
 #include "Engine/AppInstance.h"
@@ -62,7 +63,6 @@
 #include "Engine/EffectInstanceTLSData.h"
 #include "Engine/Format.h"
 #include "Engine/FileSystemModel.h"
-#include "Global/FStreamsSupport.h"
 #include "Engine/GroupInput.h"
 #include "Engine/GroupOutput.h"
 #include "Engine/GenericSchedulerThreadWatcher.h"

Engine/OfxHost.cpp

@@ -89,13 +89,13 @@ CLANG_DIAG_ON(unknown-pragmas)
 #include <ofxhParametricParam.h> //our version of parametric param suite support
 
 #include "Global/GlobalDefines.h"
+#include "Global/FStreamsSupport.h"
 #include "Global/QtCompat.h"
 #include "Global/KeySymbols.h"
 
 #include "Engine/AppInstance.h"
 #include "Engine/AppManager.h"
 #include "Engine/CreateNodeArgs.h"
-#include "Global/FStreamsSupport.h"
 #include "Engine/OfxClipInstance.h"
 #include "Engine/KnobTypes.h"
 #include "Engine/EffectDescription.h"

Engine/Project.cpp

@@ -66,13 +66,13 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 
 #include "Global/StrUtils.h"
 #include "Global/GitVersion.h"
+#include "Global/FStreamsSupport.h"
 
 #include "Engine/AppInstance.h"
 #include "Engine/AppManager.h"
 #include "Engine/CreateNodeArgs.h"
 #include "Engine/DockablePanelI.h"
 #include "Engine/EffectInstance.h"
-#include "Global/FStreamsSupport.h"
 #include "Engine/Hash64.h"
 #include "Engine/KnobFile.h"
 #include "Engine/MemoryInfo.h" // isApplication32Bits

Gui/Gui10.cpp

@@ -35,9 +35,10 @@
 #include <QApplication> // qApp
 #include <QDesktopWidget>
 
-#include "Engine/RotoLayer.h"
 #include "Global/FStreamsSupport.h"
 
+#include "Engine/RotoLayer.h"
+
 #include "Gui/DockablePanel.h"
 #include "Gui/AnimationModuleEditor.h"
 #include "Gui/FloatingWidget.h"

Gui/Gui15.cpp

@@ -36,8 +36,9 @@
 #include <QScrollArea>
 #include <QAction>
 
-#include "Engine/Settings.h"
 #include "Global/FStreamsSupport.h"
+
+#include "Engine/Settings.h"
 #include "Engine/ViewIdx.h"
 
 #include "Gui/DockablePanel.h"

Gui/NodeSettingsPanel.cpp

@@ -39,8 +39,9 @@
 #include <QGridLayout>
 #include <QDialogButtonBox>
 
-#include "Engine/EffectInstance.h"
 #include "Global/FStreamsSupport.h"
+
+#include "Engine/EffectInstance.h"
 #include "Engine/Knob.h" // KnobHolder
 #include "Engine/Node.h"
 #include "Engine/Plugin.h"

Project-xcode.xcodeproj/project.pbxproj

@@ -240,6 +240,13 @@
 			remoteGlobalIDString = 1E5F8F5118AA91330045A477;
 			remoteInfo = libs;
 		};
+		1E7DE01E1FA1FCDB0060E9E7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1EE439561FA1FC690027344A /* natron-python.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 4A14BB0D5723D26F545CC2E0;
+			remoteInfo = "natron-python";
+		};
 		1EADE5CE18AA403700EF3180 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 1EADE5C118AA403700EF3180 /* Engine.xcodeproj */;
@@ -717,6 +724,7 @@
 		1EADE5B718AA400B00EF3180 = {
 			isa = PBXGroup;
 			children = (
+				1EE439561FA1FC690027344A /* natron-python.xcodeproj */,
 				1E70D1631CF33B22000D2932 /* Documentation */,
 				1E1FB61F1DA7BB8B009F547D /* PyPlugs */,
 				1E70D1621CF33AF3000D2932 /* QMake files */,
@@ -773,6 +781,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		1EE439571FA1FC690027344A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1EE4395D1FA1FC690027344A /* natron-python */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		1EEB0B211D1ADC9A00F0D43D /* components */ = {
 			isa = PBXGroup;
 			children = (
@@ -1214,6 +1230,11 @@
 			target = 1E5F8F5118AA91330045A477 /* libs */;
 			targetProxy = 1E5F8F5B18AA91430045A477 /* PBXContainerItemProxy */;
 		};
+		1E7DE01F1FA1FCDB0060E9E7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "natron-python";
+			targetProxy = 1E7DE01E1FA1FCDB0060E9E7 /* PBXContainerItemProxy */;
+		};
 		1EADE5FF18AA408B00EF3180 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 1EADE5F818AA407D00EF3180 /* Tests */;