diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
| commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
| tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/blenkernel/intern/modifier.c | |
| parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
| parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 1358951e240..bd9cd684548 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -400,9 +400,9 @@ void modifier_setError(ModifierData *md, const char *_format, ...) /* used for buttons, to find out if the 'draw deformed in editmode' option is * there - * + * * also used in transform_conversion.c, to detect CrazySpace [tm] (2nd arg - * then is NULL) + * then is NULL) * also used for some mesh tools to give warnings */ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_lastPossibleCageIndex, bool is_virtual) |