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/editors/uvedit | |
| parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
| parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_intern.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index e3db0162f10..eed9d68f39c 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index eaea781971d..4322a3f7dfc 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -77,7 +77,7 @@ void param_delete(ParamHandle *chart); * - lscm is divided in three steps: * - begin: compute matrix and it's factorization (expensive) * - solve using pinned coordinates (cheap) - * - end: clean up + * - end: clean up * - uv coordinates are allowed to change within begin/end, for * quick re-solving */ |