diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/modifiers/intern/MOD_surfacedeform.c | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_surfacedeform.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 6dbeed9b4c8..e3d39ae4418 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1028,7 +1028,7 @@ static bool surfacedeformBind( } else if (data.success == MOD_SDEF_BIND_RESULT_GENERIC_ERR) { /* I know this message is vague, but I could not think of a way - * to explain this whith a reasonably sized message. + * to explain this with a reasonably sized message. * Though it shouldn't really matter all that much, * because this is very unlikely to occur */ modifier_setError((ModifierData *)smd, "Target contains invalid polygons"); |