Rename SequenceTemplate::Pass::renderable_name to slot_name

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 0f2a1b5499d17e3882299e84e53ff85b020ef500..3abfca81f3d6a3f0b7263c0ca98b18369c91dba6 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -16,7 +16,7 @@ SequenceBuilder::SequenceBuilder(const SequenceTemplate &t):
 {
        const vector<SequenceTemplate::Step> &steps = tmpl.get_steps();
        for(vector<SequenceTemplate::Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               renderables[i->renderable_name] = 0;
+               renderables[i->slot_name] = 0;
        const vector<SequenceTemplate::PostProcessor> &postprocs = tmpl.get_postprocessors();
        for(SequenceTemplate::PostProcessorArray::const_iterator i=postprocs.begin(); i!=postprocs.end(); ++i)
                if(!i->slot_name.empty())
@@ -46,7 +46,7 @@ void SequenceBuilder::build(Sequence &sequence) const
        const vector<SequenceTemplate::Step> &steps = tmpl.get_steps();
        for(vector<SequenceTemplate::Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
        {
-               Renderable *renderable = get_item(renderables, i->renderable_name);
+               Renderable *renderable = get_item(renderables, i->slot_name);
                if(!renderable)
                        continue;
 

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index bfab28042a9d596e6c0194ba94602b919b9220d5..46ffec702c300e5ae5f393abdbdabc8929525c9f 100644 (file)
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -113,7 +113,7 @@ void SequenceTemplate::Loader::step(const string &tag, const string &rend)
 {
        Step stp;
        stp.tag = tag;
-       stp.renderable_name = rend;
+       stp.slot_name = rend;
        if(coll)
                load_sub(stp, *coll);
        else

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 5c5b04b5fc5f315a664ad91cdd319475f7be101f..12ccd91d949cb138bac42171cd604e3a6a0c4c02 100644 (file)
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -82,7 +82,7 @@ public:
                RefPtr<Lighting> lighting;
                RefPtr<const DepthTest> depth_test;
                RefPtr<const Blend> blend;
-               std::string renderable_name;
+               std::string slot_name;
                //Renderable *default_renderable;
 
                ~Step();