Merge branch 'workshop' into RB-2.0

MrKepzie · Feb 1, 2016 · 5c85045 · 5c85045
2 parents 92de2b8 + cf4969c
commit 5c85045
Show file tree

Hide file tree

Showing 229 changed files with 1,063 additions and 147 deletions.
diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp
@@ -26,6 +26,7 @@
 
 #include <fstream>
 #include <list>
+#include <cassert>
 #include <stdexcept>
 
 #include <QtCore/QDir>
@@ -398,7 +399,10 @@ AppInstance::getWritersWorkForCL(const CLArgs& cl,std::list<AppInstance::RenderW
             }
         } else {
             writerNode = createWriter(it->filename.toStdString(), eCreateNodeReasonInternal, getProject());
-
+            if (!writerNode) {
+                throw std::runtime_error(std::string("Failed to create writer for ") + it->filename.toStdString());
+            }
+
             //Connect the writer to the corresponding Output node input
             NodePtr output = getProject()->getNodeByFullySpecifiedName(it->name.toStdString());
             if (!output) {
@@ -412,7 +416,7 @@ AppInstance::getWritersWorkForCL(const CLArgs& cl,std::list<AppInstance::RenderW
             if (outputInput) {
                 writerNode->connectInput(outputInput, 0);
             }
-            
+#pragma message WARN("what is the following line for?")
             writerNode->getScriptName().c_str();
         }
 

diff --git a/Engine/AppInstance.h b/Engine/AppInstance.h
@@ -322,6 +322,8 @@ class AppInstance
 
     virtual void renderAllViewers(bool /* canAbort*/) {}
 
+    virtual void abortAllViewers() {}
+
     virtual void declareCurrentAppVariable_Python();
 
     void execOnProjectCreatedCallback();

diff --git a/Engine/AppInstanceWrapper.cpp b/Engine/AppInstanceWrapper.cpp
@@ -24,6 +24,9 @@
 
 #include "AppInstanceWrapper.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include <QDebug>
 
 #include "Engine/AppInstance.h"

diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
@@ -28,6 +28,7 @@
 #include <clocale>
 #include <csignal>
 #include <cstddef>
+#include <cassert>
 #include <stdexcept>
 
 #if defined(Q_OS_LINUX)
@@ -795,14 +796,20 @@ AppManager::clearPluginsLoadedCache()
 void
 AppManager::clearAllCaches()
 {
-    clearDiskCache();
-    clearNodeCache();
-
     std::map<int,AppInstanceRef> copy;
     {
         QMutexLocker k(&_imp->_appInstancesMutex);
         copy = _imp->_appInstances;
     }
+
+    for (std::map<int,AppInstanceRef>::iterator it = copy.begin(); it != copy.end(); ++it) {
+        it->second.app->abortAllViewers();
+    }
+
+    clearDiskCache();
+    clearNodeCache();
+
+
     ///for each app instance clear all its nodes cache
     for (std::map<int,AppInstanceRef>::iterator it = copy.begin(); it != copy.end(); ++it) {
         it->second.app->clearOpenFXPluginsCaches();

diff --git a/Engine/AppManagerPrivate.cpp b/Engine/AppManagerPrivate.cpp
@@ -28,9 +28,9 @@
 #include <sys/time.h>     // for getrlimit on linux
 #include <sys/resource.h> // for getrlimit
 #endif
-
 #include <cstddef>
 #include <cstdlib>
+#include <cassert>
 #include <stdexcept>
 
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF

diff --git a/Engine/Backdrop.cpp b/Engine/Backdrop.cpp
@@ -23,6 +23,10 @@
 // ***** END PYTHON BLOCK *****
 
 #include "Backdrop.h"
+
+#include <cassert>
+#include <stdexcept>
+
 #include "Engine/Transform.h"
 #include "Engine/KnobTypes.h"
 

diff --git a/Engine/Bezier.cpp b/Engine/Bezier.cpp
@@ -28,8 +28,9 @@
 #include <sstream>
 #include <locale>
 #include <limits>
-#include <stdexcept>
 #include <cmath>
+#include <cassert>
+#include <stdexcept>
 
 #include <QLineF>
 #include <QtDebug>

diff --git a/Engine/BezierCP.cpp b/Engine/BezierCP.cpp
@@ -30,6 +30,7 @@
 #include <set>
 #include <list>
 #include <utility>
+#include <cassert>
 #include <stdexcept>
 
 #include <QtCore/QThread>

diff --git a/Engine/BlockingBackgroundRender.cpp b/Engine/BlockingBackgroundRender.cpp
@@ -24,6 +24,9 @@
 
 #include "BlockingBackgroundRender.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include "Global/Macros.h"
 CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated
 #include <QDebug>

diff --git a/Engine/CLArgs.cpp b/Engine/CLArgs.cpp
@@ -26,6 +26,7 @@
 
 #include <cstddef>
 #include <iostream>
+#include <cassert>
 #include <stdexcept>
 
 #include <QDebug>

diff --git a/Engine/Cache.cpp b/Engine/Cache.cpp
@@ -24,6 +24,9 @@
 
 #include "Cache.h"
 
+#include <cassert>
+#include <stdexcept>
+
 NATRON_NAMESPACE_ENTER;
 NATRON_NAMESPACE_EXIT;
 

diff --git a/Engine/CoonsRegularization.cpp b/Engine/CoonsRegularization.cpp
@@ -52,6 +52,7 @@
 #include <limits>
 #include <cfloat>
 #include <algorithm> // min, max
+#include <cassert>
 #include <stdexcept>
 
 #include "Engine/Bezier.h"

diff --git a/Engine/Curve.cpp b/Engine/Curve.cpp
@@ -25,6 +25,7 @@
 #include "Curve.h"
 
 #include <algorithm>
+#include <cassert>
 #include <stdexcept>
 
 #if !defined(SBK_RUN) && !defined(Q_MOC_RUN)

diff --git a/Engine/CurveSerialization.cpp b/Engine/CurveSerialization.cpp
@@ -24,6 +24,9 @@
 
 #include "CurveSerialization.h"
 
+#include <cassert>
+#include <stdexcept>
+
 // explicit template instantiations
 
 NATRON_NAMESPACE_ENTER;

diff --git a/Engine/DiskCacheNode.cpp b/Engine/DiskCacheNode.cpp
@@ -24,6 +24,7 @@
 
 #include "DiskCacheNode.h"
 
+#include <cassert>
 #include <stdexcept>
 
 #include "Engine/Node.h"

diff --git a/Engine/Dot.cpp b/Engine/Dot.cpp
@@ -24,6 +24,9 @@
 
 #include "Dot.h"
 
+#include <cassert>
+#include <stdexcept>
+
 NATRON_NAMESPACE_ENTER;
 
 std::string

diff --git a/Engine/EffectInstance.cpp b/Engine/EffectInstance.cpp
@@ -28,9 +28,10 @@
 #include <map>
 #include <sstream>
 #include <algorithm> // min, max
-#include <stdexcept>
 #include <fstream>
 #include <bitset>
+#include <cassert>
+#include <stdexcept>
 
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #include <QtCore/QReadWriteLock>

diff --git a/Engine/EffectInstancePrivate.cpp b/Engine/EffectInstancePrivate.cpp
@@ -24,6 +24,9 @@
 
 #include "EffectInstancePrivate.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include "Engine/AppInstance.h"
 #include "Engine/Node.h"
 #include "Engine/NodeGroup.h"

diff --git a/Engine/EffectInstanceRenderRoI.cpp b/Engine/EffectInstanceRenderRoI.cpp
@@ -28,8 +28,9 @@
 #include <map>
 #include <sstream>
 #include <algorithm> // min, max
-#include <stdexcept>
 #include <fstream>
+#include <cassert>
+#include <stdexcept>
 
 #include <QtCore/QThreadPool>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5

diff --git a/Engine/ExistenceCheckThread.cpp b/Engine/ExistenceCheckThread.cpp
@@ -20,6 +20,9 @@
 
 #include "ExistenceCheckThread.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include <QLocalSocket>
 #include <QMutex>
 #include <QWaitCondition>

diff --git a/Engine/FileDownloader.cpp b/Engine/FileDownloader.cpp
@@ -23,7 +23,10 @@
 // ***** END PYTHON BLOCK *****
 
 #include "FileDownloader.h"
+
 #include <cassert>
+#include <stdexcept>
+
 #include <QTimer>
 #include <QAbstractNetworkCache>
 

diff --git a/Engine/FileSystemModel.cpp b/Engine/FileSystemModel.cpp
@@ -25,6 +25,8 @@
 #include "FileSystemModel.h"
 
 #include <vector>
+#include <cassert>
+#include <stdexcept>
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)

diff --git a/Engine/FitCurve.cpp b/Engine/FitCurve.cpp
@@ -25,6 +25,8 @@
 #include "FitCurve.h"
 
 #include <cmath>
+#include <cassert>
+#include <stdexcept>
 
 #ifndef M_PI_2
 #define M_PI_2      1.57079632679489661923132169163975144   /* pi/2           */

diff --git a/Engine/FrameEntry.cpp b/Engine/FrameEntry.cpp
@@ -24,6 +24,9 @@
 
 #include "FrameEntry.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include "Engine/RectI.h"
 
 NATRON_NAMESPACE_ENTER;

diff --git a/Engine/FrameKey.cpp b/Engine/FrameKey.cpp
@@ -24,6 +24,9 @@
 
 #include "FrameKey.h"
 
+#include <cassert>
+#include <stdexcept>
+
 NATRON_NAMESPACE_ENTER;
 
 FrameKey::FrameKey()

diff --git a/Engine/FrameParamsSerialization.cpp b/Engine/FrameParamsSerialization.cpp
@@ -24,6 +24,9 @@
 
 #include "FrameParamsSerialization.h"
 
+#include <cassert>
+#include <stdexcept>
+
 // explicit template instantiations
 
 NATRON_NAMESPACE_ENTER;

diff --git a/Engine/GroupInput.cpp b/Engine/GroupInput.cpp
@@ -24,6 +24,9 @@
 
 #include "GroupInput.h"
 
+#include <cassert>
+#include <stdexcept>
+
 #include "Engine/KnobTypes.h"
 #include "Engine/Node.h"
 #include "Engine/NodeGroup.h" // kNatronGroupInputIsOptionalParamName, kNatronGroupInputIsMaskParamName

diff --git a/Engine/GroupOutput.cpp b/Engine/GroupOutput.cpp
@@ -24,6 +24,9 @@
 
 #include "GroupOutput.h"
 
+#include <cassert>
+#include <stdexcept>
+
 NATRON_NAMESPACE_ENTER;
 
 std::string

diff --git a/Engine/Hash64.cpp b/Engine/Hash64.cpp
@@ -25,6 +25,9 @@
 #include "Hash64.h"
 
 #include <algorithm>  // for std::for_each
+#include <cassert>
+#include <stdexcept>
+
 #if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
 #include <boost/crc.hpp>
 #endif

diff --git a/Engine/HistogramCPU.cpp b/Engine/HistogramCPU.cpp
@@ -25,6 +25,9 @@
 #include "HistogramCPU.h"
 
 #include <algorithm>
+#include <cassert>
+#include <stdexcept>
+
 #include <QMutex>
 #include <QWaitCondition>
 

diff --git a/Engine/Image.cpp b/Engine/Image.cpp
@@ -25,6 +25,8 @@
 #include "Image.h"
 
 #include <algorithm> // min, max
+#include <cassert>
+#include <stdexcept>
 
 #include <QDebug>
 

diff --git a/Engine/ImageComponents.cpp b/Engine/ImageComponents.cpp
@@ -19,6 +19,9 @@
 #include "ImageComponents.h"
 #include "ofxNatron.h"
 
+#include <cassert>
+#include <stdexcept>
+
 NATRON_NAMESPACE_ENTER;
 
 static const char* rgbaComps[4] = {"R","G","B","A"};

diff --git a/Engine/ImageConvert.cpp b/Engine/ImageConvert.cpp
@@ -25,6 +25,8 @@
 #include "Image.h"
 
 #include <algorithm> // min, max
+#include <cassert>
+#include <stdexcept>
 
 #include <QDebug>
 #ifndef Q_MOC_RUN