diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp index 5695ca7fd..449f8d255 100644 --- a/code/C4DImporter.cpp +++ b/code/C4DImporter.cpp @@ -292,7 +292,7 @@ void C4DImporter::ReadMaterials(melange::BaseMaterial* mat) mat->GetParameter(MATERIAL_COLOR_COLOR, data); Vector color = data.GetVector(); mat->GetParameter(MATERIAL_COLOR_BRIGHTNESS, data); - const Float brightness = data.GetFloat(); + const Float brightness = data.GetFloat(); color *= brightness; @@ -511,13 +511,13 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) // copy normals if (normals_src) { - if(i >= normals_src->GetDataCount()) { + if(i >= normals_src->GetDataCount()) { LogError("unexpected number of normals, ignoring"); } else { - ConstNormalHandle normal_handle = normals_src->GetDataAddressR(); - NormalStruct nor; - NormalTag::Get(normal_handle, i, nor); + ConstNormalHandle normal_handle = normals_src->GetDataAddressR(); + NormalStruct nor; + NormalTag::Get(normal_handle, i, nor); normals->x = nor.a.x; normals->y = nor.a.y; normals->z = nor.a.z; diff --git a/code/C4DImporter.h b/code/C4DImporter.h index 28abde51e..3ba2a17c6 100644 --- a/code/C4DImporter.h +++ b/code/C4DImporter.h @@ -103,17 +103,17 @@ protected: private: - void ReadMaterials(melange::BaseMaterial* mat); - void RecurseHierarchy(melange::BaseObject* object, aiNode* parent); - aiMesh* ReadMesh(melange::BaseObject* object); - unsigned int ResolveMaterial(melange::PolygonObject* obj); + void ReadMaterials(melange::BaseMaterial* mat); + void RecurseHierarchy(melange::BaseObject* object, aiNode* parent); + aiMesh* ReadMesh(melange::BaseObject* object); + unsigned int ResolveMaterial(melange::PolygonObject* obj); - bool ReadShader(aiMaterial* out, melange::BaseShader* shader); + bool ReadShader(aiMaterial* out, melange::BaseShader* shader); std::vector meshes; std::vector materials; - typedef std::map MaterialMap; + typedef std::map MaterialMap; MaterialMap material_mapping; }; // !class C4DImporter