X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.cpp;h=5d7f4d0b2104caf5474bbd2155677e5bf95c0736;hb=e6e6f0fe81a2f92985e65ae0de708974194d81a3;hp=6e50c24838aafeebd751008a10e7e36d40022ec9;hpb=006bdb4f8660098fc524dcca80b24c943c65b249;p=libs%2Fgl.git

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index 6e50c248..5d7f4d0b 100644
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
+#include <msp/strings/format.h>
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "bloom.h"
@@ -122,14 +123,9 @@ void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &r
 	Step stp;
 	stp.tag = tag;
 	stp.slot_name = rend;
-	if(coll)
-	{
-		Step::Loader ldr(stp, *coll);
-		ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
-		load_sub_with(ldr);
-	}
-	else
-		load_sub(stp);
+	Step::Loader ldr(stp, *coll);
+	ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
+	load_sub_with(ldr);
 
 	obj.steps.push_back(stp);
 }
@@ -159,19 +155,8 @@ void SequenceTemplate::ClearLoader::stencil(int s)
 }
 
 
-SequenceTemplate::Step::Loader::Loader(Step &p):
-	DataFile::CollectionObjectLoader<Step>(p, 0)
-{
-	init();
-}
-
 SequenceTemplate::Step::Loader::Loader(Step &p, Collection &c):
 	DataFile::CollectionObjectLoader<Step>(p, &c)
-{
-	init();
-}
-
-void SequenceTemplate::Step::Loader::init()
 {
 	add("blend", &Loader::blend);
 	add("blend", &Loader::blend_factors);
@@ -212,7 +197,7 @@ void SequenceTemplate::Step::Loader::depth_compare(Predicate c)
 void SequenceTemplate::Step::Loader::lighting_inline()
 {
 	RefPtr<Lighting> lightn = new Lighting;
-	load_sub(*lightn);
+	load_sub(*lightn, get_collection());
 	get_collection().add(inline_base_name+".lightn", lightn.get());
 	obj.lighting = lightn.release();
 }