[Bf-blender-cvs] [08b4c9a815c] blender-v2.83-release: Multires: Correct NULL-pointer check

[Sergey Sharybin]

Commit: 08b4c9a815c0426bbba9738bce1b10ea4acdaf48
Author: Sergey Sharybin
Date:   Tue May 12 15:49:31 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB08b4c9a815c0426bbba9738bce1b10ea4acdaf48

Multires: Correct NULL-pointer check

There is some hard-to-reproduce scenario when top level
would have masks allocated, but without masks on the sculpt
level.

Need to check proper array before accessing its elements.
The check for top-level masks is done by the caller.

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

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 514608a0f1d..d99e27ad9dd 100644
--- a/source/blender/blenkernel/intern/multires_reshape_smooth.c
+++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c
@@ -127,7 +127,7 @@ static float interpolate_masks_grid(const MultiresReshapeSmoothContext *reshape_
                                     const GridCoord *grid_coord)
 {
   const MultiresReshapeContext *reshape_context = reshape_smooth_context->reshape_context;
-  if (reshape_context->grid_paint_masks == NULL) {
+  if (reshape_context->orig.grid_paint_masks == NULL) {
     return 0.0f;
   }