Merge branch 'master' of https://github.com/patrikhuber/eos

patrikhuber · patrikhuber · commit bc6a5cb405ba · 2018-11-18T15:42:43.000Z
diff --git a/matlab/+eos/+fitting/private/fitting.cpp b/matlab/+eos/+fitting/private/fitting.cpp
@@ -90,7 +90,7 @@ void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])
         const auto morphable_model = morphablemodel::load_model(morphablemodel_file);
         const auto blendshapes = morphablemodel::load_blendshapes(blendshapes_file);
         morphable_model_with_expressions = morphablemodel::MorphableModel(
-            morphable_model.get_shape_model(), blendshapes, morphable_model.get_color_model(),
+            morphable_model.get_shape_model(), blendshapes, morphable_model.get_color_model(), cpp17::nullopt,
             morphable_model.get_texture_coordinates());
     }
     const core::LandmarkMapper landmark_mapper(mapper_file);

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])`
`90`	`90`	`const auto morphable_model = morphablemodel::load_model(morphablemodel_file);`
`91`	`91`	`const auto blendshapes = morphablemodel::load_blendshapes(blendshapes_file);`
`92`	`92`	`morphable_model_with_expressions = morphablemodel::MorphableModel(`
`93`		`- morphable_model.get_shape_model(), blendshapes, morphable_model.get_color_model(),`
	`93`	`+ morphable_model.get_shape_model(), blendshapes, morphable_model.get_color_model(), cpp17::nullopt,`
`94`	`94`	`morphable_model.get_texture_coordinates());`
`95`	`95`	`}`
`96`	`96`	`const core::LandmarkMapper landmark_mapper(mapper_file);`