Skip to content

Commit 7d8d1fa

Browse files
committed
Style fix
1 parent fd5cbbc commit 7d8d1fa

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/SdfEntityCreator.cc

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,10 @@ Entity SdfEntityCreator::CreateEntities(const sdf::Visual *_visual)
940940
components::Geometry(*_visual->Geom()));
941941
}
942942

943+
sdf::Material visualMaterial;
943944
if (_visual->Material())
944945
{
945-
sdf::Material visualMaterial = *_visual->Material();
946+
visualMaterial = *_visual->Material();
946947
if (!_visual->Material()->ScriptUri().empty())
947948
{
948949
gzwarn << "Gazebo does not support Ogre material scripts. See " <<
@@ -966,7 +967,7 @@ Entity SdfEntityCreator::CreateEntities(const sdf::Visual *_visual)
966967
std::optional<MaterialParser::MaterialValues> parsed =
967968
this->dataPtr->materialParser.GetMaterialValues(scriptName);
968969

969-
if(parsed.has_value())
970+
if (parsed.has_value())
970971
{
971972
visualMaterial.SetAmbient
972973
(parsed->ambient.value_or(visualMaterial.Ambient()));
@@ -982,15 +983,9 @@ Entity SdfEntityCreator::CreateEntities(const sdf::Visual *_visual)
982983
}
983984
}
984985
}
985-
this->dataPtr->ecm->CreateComponent(visualEntity,
986-
components::Material(visualMaterial));
987-
}
988-
else
989-
{
990-
sdf::Material visualMaterial;
991-
this->dataPtr->ecm->CreateComponent(visualEntity,
992-
components::Material(visualMaterial));
993986
}
987+
this->dataPtr->ecm->CreateComponent(visualEntity,
988+
components::Material(visualMaterial));
994989

995990
// store the plugin in a component
996991
if (!_visual->Plugins().empty())

0 commit comments

Comments
 (0)