X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.h;h=d149a7d029dd17d552c862b35f5e5c3e98094b44;hp=de04461af05f3510f96630c23968773ab9ef19bb;hb=3ac3a51c623271da815c8ee60c484445871753bf;hpb=885b8ad08cfcefba4b95ec9028fa1e25df2fe171

diff --git a/source/materials/renderpass.h b/source/materials/renderpass.h
index de04461a..d149a7d0 100644
--- a/source/materials/renderpass.h
+++ b/source/materials/renderpass.h
@@ -25,14 +25,20 @@ public:
 	class Loader: public DataFile::CollectionObjectLoader<RenderPass>
 	{
 	private:
+		std::string inline_base_name;
+
 		static ActionMap shared_actions;
 
 	public:
 		Loader(RenderPass &);
 		Loader(RenderPass &, Collection &);
-
 	private:
 		virtual void init_actions();
+	
+	public:
+		void set_inline_base_name(const std::string &);
+
+	private:
 		virtual void finish();
 
 		static std::string get_shader_name(const std::string &);
@@ -71,11 +77,11 @@ private:
 		TextureSlot(Tag t): tag(t), texture(0), sampler(0) { }
 	};
 
-	RefPtr<const Program> shprog;
+	const Program *shprog;
 	bool shprog_from_material;
 	RefPtr<ProgramData> shdata;
 	std::map<Tag, Tag> uniform_slots;
-	RefPtr<const Material> material;
+	const Material *material;
 	std::string material_slot;
 	std::vector<TextureSlot> textures;
 	bool back_faces;
@@ -91,11 +97,11 @@ private:
 
 public:
 	void set_shader_program(const Program *, const ProgramData *);
-	const Program *get_shader_program() const { return shprog.get(); }
+	const Program *get_shader_program() const { return shprog; }
 	const ProgramData *get_shader_data() const { return shdata.get(); }
 	Tag get_slotted_uniform_tag(Tag) const;
 	void set_material(const Material *);
-	const Material *get_material() const { return material.get(); }
+	const Material *get_material() const { return material; }
 	const std::string &get_material_slot_name() const { return material_slot; }
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
 	Tag get_texture_tag(const std::string &) const;