Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-02-16 15:58:03 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-02-16 15:58:03 +0300
commit2442c85dc3da289343f13fecf56b77ad09aceefa (patch)
tree70b8cde46cf74602d7746b99ae609cc5061cb3b3
parent1ec30d4b15684df333926aae78516b07dab428ad (diff)
parentc13754e6475e438ebd2fbafa2e51aa58504dc5f9 (diff)
Merge branch 'blender-v2.92-release'
-rw-r--r--source/blender/blenkernel/intern/lattice.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 3d3ade1a529..625d2353e3e 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -321,19 +321,21 @@ void BKE_lattice_resize(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
* size first.
*/
if (ltOb) {
- if (uNew != 1 && lt->pntsu != 1) {
- fu = lt->fu;
- du = (lt->pntsu - 1) * lt->du / (uNew - 1);
+ const float default_size = 1.0;
+
+ if (uNew != 1) {
+ fu = -default_size / 2.0;
+ du = default_size / (uNew - 1);
}
- if (vNew != 1 && lt->pntsv != 1) {
- fv = lt->fv;
- dv = (lt->pntsv - 1) * lt->dv / (vNew - 1);
+ if (vNew != 1) {
+ fv = -default_size / 2.0;
+ dv = default_size / (vNew - 1);
}
- if (wNew != 1 && lt->pntsw != 1) {
- fw = lt->fw;
- dw = (lt->pntsw - 1) * lt->dw / (wNew - 1);
+ if (wNew != 1) {
+ fw = -default_size / 2.0;
+ dw = default_size / (wNew - 1);
}
}