v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: add obj-material handling for <color> 0 instead of <color> r g b. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/334/head
Kim Kulling 2014-08-16 11:39:28 +02:00
parent 3d6b1932f9
commit 5e265610fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/ObjFileMtlImporter.cpp
View File

@ -223,15 +223,17 @@ void ObjFileMtlImporter::getColorRGBA( aiColor3D *pColor )
{ {
ai_assert( NULL != pColor ); ai_assert( NULL != pColor );
float r, g, b; float r( 0.0f ), g( 0.0f ), b( 0.0f );
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, r ); m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, r );
pColor->r = r; pColor->r = r;
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, g ); // we have to check if color is default 0 with only one token
pColor->g = g; if( !isNewLine( *m_DataIt ) ) {
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, g );
m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, b ); m_DataIt = getFloat<DataArrayIt>( m_DataIt, m_DataItEnd, b );
pColor->b = b; }
pColor->g = g;
pColor->b = b;
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------