[Bf-blender-cvs] [b2dc8bd92eb] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: b2dc8bd92eb503db26ae01225f9e9f99e3ebe53f
Author: Pablo Dobarro
Date:   Mon Aug 2 21:35:31 2021 +0200
Branches: sculpt-dev
https://developer.blender.org/rBb2dc8bd92eb503db26ae01225f9e9f99e3ebe53f

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenkernel/intern/mesh_remesh_voxel.cc
index db455aa07f0,63b0403dcea..5e17b006ac8
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
@@@ -33,8 -33,8 +33,9 @@@
  #include "BLI_array.hh"
  #include "BLI_float3.hh"
  #include "BLI_index_range.hh"
+ #include "BLI_span.hh"
  
 +#include "DNA_object_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_meshdata_types.h"
  
diff --cc source/blender/editors/object/object_remesh.cc
index fbc7f136bd5,d56cb3c7548..e859b8fa85a
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@@ -166,12 -166,12 +166,13 @@@ static int voxel_remesh_exec(bContext *
      Mesh *mesh_fixed_poles = BKE_mesh_remesh_voxel_fix_poles(new_mesh);
      BKE_id_free(nullptr, new_mesh);
      new_mesh = mesh_fixed_poles;
-     BKE_mesh_calc_normals(new_mesh);
    }
  
+   BKE_mesh_calc_normals(new_mesh);
+ 
    if (mesh->flag & ME_REMESH_REPROJECT_VOLUME || mesh->flag & ME_REMESH_REPROJECT_PAINT_MASK ||
 -      mesh->flag & ME_REMESH_REPROJECT_SCULPT_FACE_SETS) {
 +      mesh->flag & ME_REMESH_REPROJECT_SCULPT_FACE_SETS ||
 +      mesh->flag & ME_REMESH_REPROJECT_MATERIALS) {
      BKE_mesh_runtime_clear_geometry(mesh);
    }