diff --git a/source/graphics/Material.cpp b/source/graphics/Material.cpp
index 40f6f025d8..0469f58a39 100644
--- a/source/graphics/Material.cpp
+++ b/source/graphics/Material.cpp
@@ -80,7 +80,7 @@ void CMaterial::RecomputeCombinedShaderDefines()
 		{
 			if (i & (1 << j))
 			{
-				CShaderConditionalDefines::CondDefine& def = m_ConditionalDefines.GetItem(j);
+				const CShaderConditionalDefines::CondDefine& def = m_ConditionalDefines.GetItem(j);
 				defs.Add(def.m_DefName.c_str(), def.m_DefValue.c_str());
 			}
 		}
diff --git a/source/graphics/ShaderDefines.cpp b/source/graphics/ShaderDefines.cpp
index 19cc4adfc9..e6ccb7ee7a 100644
--- a/source/graphics/ShaderDefines.cpp
+++ b/source/graphics/ShaderDefines.cpp
@@ -250,16 +250,6 @@ void CShaderRenderQueries::Add(const char* name)
 	}
 }
 
-size_t CShaderRenderQueries::GetSize()
-{
-	return m_Items.size();
-}
-
-CShaderRenderQueries::RenderQuery CShaderRenderQueries::GetItem(size_t i)
-{
-	return m_Items[i];
-}
-
 void CShaderConditionalDefines::Add(const char* defname, const char* defvalue, int type, std::vector<float> &args)
 {
 	CondDefine cd;
@@ -271,16 +261,6 @@ void CShaderConditionalDefines::Add(const char* defname, const char* defvalue, i
 	m_Defines.push_back(cd);
 }
 
-size_t CShaderConditionalDefines::GetSize()
-{
-	return m_Defines.size();
-}
-
-CShaderConditionalDefines::CondDefine& CShaderConditionalDefines::GetItem(size_t i)
-{
-	return m_Defines[i];
-}
-
 
 // Explicit instantiations:
 
diff --git a/source/graphics/ShaderDefines.h b/source/graphics/ShaderDefines.h
index 6d1d0481a9..aaae25a6a5 100644
--- a/source/graphics/ShaderDefines.h
+++ b/source/graphics/ShaderDefines.h
@@ -186,8 +186,8 @@ public:
 	typedef std::pair<int, CStrIntern> RenderQuery;
 	
 	void Add(const char* name);
-	size_t GetSize();
-	RenderQuery GetItem(size_t i);
+	size_t GetSize() const { return m_Items.size(); }
+	RenderQuery GetItem(size_t i) const { return m_Items[i]; }
 private:
 	std::vector<RenderQuery> m_Items;
 };
@@ -210,8 +210,8 @@ public:
 	};
 	
 	void Add(const char* defname, const char* defvalue, int type, std::vector<float> &args);
-	size_t GetSize();
-	CondDefine& GetItem(size_t i);
+	size_t GetSize() const { return m_Defines.size(); }
+	const CondDefine& GetItem(size_t i) const { return m_Defines[i]; }
 	
 private:
 	std::vector<CondDefine> m_Defines;
diff --git a/source/renderer/ModelRenderer.cpp b/source/renderer/ModelRenderer.cpp
index e705a7503f..873578b193 100644
--- a/source/renderer/ModelRenderer.cpp
+++ b/source/renderer/ModelRenderer.cpp
@@ -429,10 +429,10 @@ void ShaderModelRenderer::Render(const RenderModifierPtr& modifier, const CShade
 
 			uint32_t condFlags = 0;
 
-			CShaderConditionalDefines condefs = model->GetMaterial().GetConditionalDefines();
+			const CShaderConditionalDefines& condefs = model->GetMaterial().GetConditionalDefines();
 			for (size_t j = 0; j < condefs.GetSize(); ++j)
 			{
-				CShaderConditionalDefines::CondDefine &item = condefs.GetItem(j);
+				const CShaderConditionalDefines::CondDefine &item = condefs.GetItem(j);
 				int type = item.m_CondType;
 				switch (type)
 				{