Resolved conflicts

Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47

src/Nazara/Renderer/Material.cpp

@@ -148,6 +148,8 @@ void NzMaterial::Reset()
 	m_shininess = 0;
 	m_specularColor = NzColor::White;
 	m_srcBlend = nzBlendFunc_One;
+	m_textureFilter = nzTextureFilter_Default;
+	m_textureWrap = nzTextureWrap_Repeat;
 	m_zTestCompareFunc = nzRendererComparison_LessOrEqual;
 	m_zTestEnabled = true;
 	m_zWriteEnabled = true;