Merge branch 'master' into devel

patrikhuber · patrikhuber · commit 1c4f55e04f69 · 2018-10-20T22:56:34.000+01:00
diff --git a/include/eos/morphablemodel/PcaModel.hpp b/include/eos/morphablemodel/PcaModel.hpp
@@ -110,7 +110,7 @@ class PcaModel
      *
      * @return The list of triangles to build a mesh.
      */
-    std::vector<std::array<int, 3>> get_triangle_list() const
+    const std::vector<std::array<int, 3>>& get_triangle_list() const
     {
         return triangle_list;
     };

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class PcaModel`
`110`	`110`	`*`
`111`	`111`	`* @return The list of triangles to build a mesh.`
`112`	`112`	`*/`
`113`		`- std::vector<std::array<int, 3>> get_triangle_list() const`
	`113`	`+ const std::vector<std::array<int, 3>>& get_triangle_list() const`
`114`	`114`	`{`
`115`	`115`	`return triangle_list;`
`116`	`116`	`};`