Rearrange postprocessor creation code in SequenceBuilder

[libs/gl.git] / source / builders / sequencebuilder.cpp

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 5af62127ca4ff02712390793e70ec2735a401e7c..f007350eeaa0e76ad023055f59d133bd407e368a 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -61,7 +61,7 @@ void SequenceBuilder::build(Sequence &sequence) const
        {
                Renderable *renderable = get_item(renderables, s.renderable_name);
                if(!renderable)
-                       continue;
+                       throw missing_renderable(s.renderable_name);
 
                Sequence::Step &step = sequence.add_step(s.tag, *renderable);
                step.set_depth_test(s.depth_test);
@@ -74,24 +74,26 @@ void SequenceBuilder::build(Sequence &sequence) const
 #endif
        for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
        {
-               RefPtr<PostProcessor> proc = 0;
+               PostProcessor *proc = 0;
                if(!p.slot_name.empty())
                        proc = get_item(postprocessors, p.slot_name);
-               if(proc)
-                       sequence.add_postprocessor(*proc);
-               else if(p.postprocessor_template)
+               if(!proc)
                {
-                       proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
-                       if(proc)
+                       if(p.postprocessor_template)
                        {
+                               proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
 #ifdef DEBUG
                                if(!debug_name.empty())
                                        proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
-                               sequence.add_postprocessor(*proc.get());
-                               sequence.add_owned(proc.release());
                        }
+                       else
+                               throw invalid_operation("SequenceBuilder::build");
+
+                       sequence.add_owned(proc);
                }
+
+               sequence.add_postprocessor(*proc);
        }
 }