[Bf-blender-cvs] [09895cae484] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 09895cae4846181783793953bc300013dd59817b
Author: Bastien Montagne
Date:   Thu Aug 23 14:56:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB09895cae4846181783793953bc300013dd59817b

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/lattice.c
index 04830eb1081,582743acff4..ca555a46da5
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@@ -623,9 -624,9 +623,9 @@@ static bool calc_curve_deform(Object *p
  	if (is_neg_axis) {
  		index = axis - 3;
  		if (cu->flag & CU_STRETCH)
- 			fac = (-co[index] - cd->dmax[index]) / (cd->dmax[index] - cd->dmin[index]);
+ 			fac = -(co[index] - cd->dmax[index]) / (cd->dmax[index] - cd->dmin[index]);
  		else
 -			fac = -(co[index] - cd->dmax[index]) / (par->curve_cache->path->totdist);
 +			fac = -(co[index] - cd->dmax[index]) / (par->runtime.curve_cache->path->totdist);
  	}
  	else {
  		index = axis;