diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-21 00:03:51 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-21 00:03:51 +0300 |
| commit | 3b36e2b7817dee8a800f3c4f4b89b7f64da8155b (patch) | |
| tree | 62786e141de120bb7765a240ebe7321dfb4007cd /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 57c3718447a4b3db92475ecc86a6d793bd839aef (diff) | |
| parent | ce0bcd5fbf40b44c515773434bc7187b093fdb53 (diff) | |
Merge branch 'master' into newboolean
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 4f587abd9f0..263f63cb6da 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1991,9 +1991,9 @@ Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, } Mesh *mesh_create_eval_final(Depsgraph *depsgraph, - Scene *scene, - Object *ob, - const CustomData_MeshMasks *dataMask) + Scene *scene, + Object *ob, + const CustomData_MeshMasks *dataMask) { Mesh *final; |