Revert changes

Former-commit-id: 25a7ecad35f3fe38638f608f375ed9c8c5df873e [formerly fa3383a06a186551d427aee0e3def1e543b73a1b]
Former-commit-id: 5923cbbb60c4464741449c997c39212d2bc075f8
This commit is contained in:
Gawaboumga 2016-06-08 14:13:19 +02:00
parent 363299f4de
commit 4710da1f6c
2 changed files with 24 additions and 10 deletions

View File

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

View File

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