From e4b8aa2d78eadb2e61e306dbbd7ad507fa0c6906 Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <jslee02@gmail.com>
Date: Wed, 10 Feb 2016 07:56:02 -0500
Subject: [PATCH] Fix memory alignment for Eigen object in mesh loading

---
 dart/utils/SkelParser.cpp    | 2 +-
 dart/utils/sdf/SdfParser.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dart/utils/SkelParser.cpp b/dart/utils/SkelParser.cpp
index 3ca4512a6974a..251e9f545201e 100644
--- a/dart/utils/SkelParser.cpp
+++ b/dart/utils/SkelParser.cpp
@@ -869,7 +869,7 @@ dynamics::ShapePtr SkelParser::readShape(
     const aiScene* model = dynamics::MeshShape::loadMesh(meshUri, _retriever);
     if (model)
     {
-      newShape = std::make_shared<dynamics::MeshShape>(
+      newShape = Eigen::make_aligned_shared<dynamics::MeshShape>(
         scale, model, meshUri, _retriever);
     }
     else
diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp
index 331e7209c9b05..051be06b9fec7 100644
--- a/dart/utils/sdf/SdfParser.cpp
+++ b/dart/utils/sdf/SdfParser.cpp
@@ -646,7 +646,7 @@ dynamics::ShapePtr SdfParser::readShape(
     const aiScene* model = dynamics::MeshShape::loadMesh(meshUri, _retriever);
 
     if (model)
-      newShape = std::make_shared<dynamics::MeshShape>(
+      newShape = Eigen::make_aligned_shared<dynamics::MeshShape>(
         scale, model, meshUri, _retriever);
     else
     {