diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /source/blender/blenkernel/intern/editderivedmesh.c | |
parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 0491cbd21f0..2018962eb62 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -44,7 +44,7 @@ #include "atomic_ops.h" #include "BLI_math.h" -#include "BLI_jitter.h" +#include "BLI_jitter_2d.h" #include "BLI_bitmap.h" #include "BLI_task.h" |