diff options
| author | Markus Wick <markus@selfnet.de> | 2015-07-08 09:37:06 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-07-08 09:37:06 +0200 |
| commit | f6766dd34788c1e8194c15d308ba280f16c4fde7 (patch) | |
| tree | b6b349dd96d165b6ab3294ec7d8d1d9d343041f0 /Source/Core/VideoCommon/VertexLoaderBase.cpp | |
| parent | 761cb6a99a30bdc209e87c299aa4796a435d3cb4 (diff) | |
| parent | df379dabae6cd214aa56c1fecdb55133249a1847 (diff) | |
Merge pull request #2722 from lioncash/statement
VertexLoaderBase: Adjust the scope of a boolean variable
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderBase.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 34fa375ee1..681f43b4fa 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -131,13 +131,14 @@ public: : VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b) { m_initialized = a && b && a->IsInitialized() && b->IsInitialized(); - bool can_test = a->m_VertexSize == b->m_VertexSize && - a->m_native_components == b->m_native_components && - a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride; if (m_initialized) { - if (can_test) + m_initialized = a->m_VertexSize == b->m_VertexSize && + a->m_native_components == b->m_native_components && + a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride; + + if (m_initialized) { m_VertexSize = a->m_VertexSize; m_native_components = a->m_native_components; @@ -152,8 +153,6 @@ public: b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride); } } - - m_initialized &= can_test; } ~VertexLoaderTester() override { |