diff transform/ModelTransformer.cpp @ 851:c9846844ac11 tonioni

Merge branch tonioni_multi_transform

--- a/transform/ModelTransformer.cpp	Tue Nov 26 14:37:01 2013 +0000
+++ b/transform/ModelTransformer.cpp	Mon Dec 02 15:47:06 2013 +0000
@@ -16,9 +16,16 @@
 #include "ModelTransformer.h"
 
 ModelTransformer::ModelTransformer(Input input, const Transform &transform) :
-    m_transform(transform),
     m_input(input),
-    m_output(0),
+    m_detached(false),
+    m_abandoned(false)
+{
+    m_transforms.push_back(transform);
+}
+
+ModelTransformer::ModelTransformer(Input input, const Transforms &transforms) :
+    m_transforms(transforms),
+    m_input(input),
     m_detached(false),
     m_abandoned(false)
 {
@@ -28,6 +35,10 @@
 {
     m_abandoned = true;
     wait();
-    if (!m_detached) delete m_output;
+    if (!m_detached) {
+        foreach (Model *m, m_outputs) {
+            delete m;
+        }
+    }
 }