diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-02-11 16:57:41 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-02-11 16:57:41 +0300 |
commit | 30f65b54a78edc2a974ba93fefa86534fe2b7ff4 (patch) | |
tree | 030cf43b7c2cbd649a2e8758bf319a5b76a29aef /source/blender/blenkernel/intern/mesh_merge.c | |
parent | 9052c6fafa87654c9a45ce0d5b9ecee073ec1a5b (diff) | |
parent | 3657bb514130ce2d28c407432d6f10202a68c92a (diff) |
Merge branch 'master' into draw-colormanagementdraw-colormanagement
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index ae808b85323..d646e988c60 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -33,7 +33,7 @@ #include "BLI_ghash.h" #include "BKE_customdata.h" -#include "BKE_library.h" +#include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" |