From 1b0a0675dc1dd90826867a7c4c598bbd42ec63ef Mon Sep 17 00:00:00 2001 From: Marc-Antoine Lortie Date: Sat, 4 Apr 2020 10:32:29 -0400 Subject: [PATCH] Applied review requested changes - renamed _data to data. --- tools/assimp_view/Material.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/assimp_view/Material.cpp b/tools/assimp_view/Material.cpp index 57fa049fd..cbb4e565c 100644 --- a/tools/assimp_view/Material.cpp +++ b/tools/assimp_view/Material.cpp @@ -627,7 +627,7 @@ void CMaterialManager::HMtoNMIfNecessary( { union { - struct {unsigned char b,g,r,a;} _data; + struct {unsigned char b,g,r,a;} data; char _array[4]; }; }; @@ -646,7 +646,7 @@ void CMaterialManager::HMtoNMIfNecessary( { for (unsigned int x = 0; x < sDesc.Width;++x) { - if (pcPointer->_data.b != pcPointer->_data.r || pcPointer->_data.b != pcPointer->_data.g) + if (pcPointer->data.b != pcPointer->data.r || pcPointer->data.b != pcPointer->data.g) { bIsEqual = false; break; @@ -705,9 +705,9 @@ void CMaterialManager::HMtoNMIfNecessary( aiColor3D clrColorLine; for (unsigned int x = 0; x < sDesc.Width;++x) { - clrColorLine.r += pcPointer->_data.r; - clrColorLine.g += pcPointer->_data.g; - clrColorLine.b += pcPointer->_data.b; + clrColorLine.r += pcPointer->data.r; + clrColorLine.g += pcPointer->data.g; + clrColorLine.b += pcPointer->data.b; pcPointer++; } clrColor.r += clrColorLine.r /= (float)sDesc.Width;