[Bf-blender-cvs] [2843af93579] master: Multires: Fix mask interpolation weights

[Sergey Sharybin]

Commit: 2843af935799fd651e8b0e78636f20bd029f193e
Author: Sergey Sharybin
Date:   Wed May 13 09:58:19 2020 +0200
Branches: master
https://developer.blender.org/rB2843af935799fd651e8b0e78636f20bd029f193e

Multires: Fix mask interpolation weights

Weights were in the different order from corners.

Doesn't fix propagation issues, but fixes an essential step towards
fully correct propagation.

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

M	source/blender/blenkernel/intern/multires_reshape_smooth.c

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

diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c
index 3f312960448..ca95205e70d 100644
--- a/source/blender/blenkernel/intern/multires_reshape_smooth.c
+++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c
@@ -175,7 +175,7 @@ static float interpolate_masks_grid(const MultiresReshapeSmoothContext *reshape_
 
   const float u = x_f - x_i;
   const float v = y_f - y_i;
-  const float weights[4] = {(1.0f - u) * (1.0f - v), u * (1.0f - v), (1.0f - u) * v, u * v};
+  const float weights[4] = {(1.0f - u) * (1.0f - v), u * (1.0f - v), u * v, (1.0f - u) * v};
 
   return mask_elements[0] * weights[0] + mask_elements[1] * weights[1] +
          mask_elements[2] * weights[2] + mask_elements[3] * weights[3];