Revert changes

Former-commit-id: 0034c2038ece25081a9975d29f50165e8545eacc [formerly c6e83866ba222715b7f08095494c9f2749fafa8b]
Former-commit-id: 66ad8e4a0df7eda465601c1695db5fbd39b792a4
This commit is contained in:
Gawaboumga 2016-06-08 14:13:19 +02:00
parent 05e4eaabbc
commit 61c6cde4c0
2 changed files with 24 additions and 10 deletions

View File

@ -2827,15 +2827,21 @@ namespace Nz
{
const char* c = oldCharacters;
char character = Detail::ToLower(*ptr);
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
EnsureOwnership();
ptr = &m_sharedString->string[offset];
bool found = false;
do
{
if (character == Detail::ToLower(*c))
{
if (!found)
{
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
EnsureOwnership();
ptr = &m_sharedString->string[offset];
found = true;
}
*ptr = replaceCharacter;
++count;
break;
@ -2847,12 +2853,19 @@ namespace Nz
}
else
{
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
EnsureOwnership();
ptr = &m_sharedString->string[offset];
bool found = false;
while ((ptr = std::strpbrk(ptr, oldCharacters)) != nullptr)
{
if (!found)
{
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
EnsureOwnership();
ptr = &m_sharedString->string[offset];
found = true;
}
*ptr++ = replaceCharacter;
++count;
}

View File

@ -464,6 +464,7 @@ namespace Nz
void DepthRenderTechnique::DrawOpaqueModels(const SceneData& sceneData, ForwardRenderQueue::Layer& layer) const
{
const Shader* lastShader = nullptr;
const ShaderUniforms* shaderUniforms = nullptr;
for (auto& matIt : layer.opaqueModels)
{
@ -487,7 +488,7 @@ namespace Nz
if (shader != lastShader)
{
// Index of uniforms in the shader
GetShaderUniforms(shader);
shaderUniforms = GetShaderUniforms(shader);
lastShader = shader;
}