[Bf-blender-cvs] [7c4eb4f8dbc] temp_bmesh_multires: Merge branch 'master' into temp_bmesh_multires

[Joseph Eagar]

Commit: 7c4eb4f8dbcf5fd98d8b089aa3cd7291b3910357
Author: Joseph Eagar
Date:   Sat Jul 17 00:44:01 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB7c4eb4f8dbcf5fd98d8b089aa3cd7291b3910357

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc release/datafiles/locale
index 1ab25ca4f20,4833954c0ac..f3791fbfdb8
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 1ab25ca4f208edc8fb6c3551b3050ce3ad50ad7c
 -Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
++Subproject commit f3791fbfdb839860035241ba477bf8872966af93
diff --cc source/blender/bmesh/intern/bmesh_log.c
index 421336a5cbe,9033e43374b..abdcfeb8d6c
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@@ -1219,9 -736,11 +1219,9 @@@ void BM_log_entry_drop(BMLogEntry *entr
       * the entry is at the end of the undo stack, and it's being
       * deleted, those elements can never be restored. Their IDs
       * can go back into the pool. */
 -    bm_log_id_ghash_release(log, entry->added_faces);
 -    bm_log_id_ghash_release(log, entry->added_verts);
    }
    else {
-     BLI_assert(!"Cannot drop BMLogEntry from middle");
+     BLI_assert_msg(0, "Cannot drop BMLogEntry from middle");
    }
  
    if (log->current_entry == entry) {
diff --cc source/blender/bmesh/intern/bmesh_mesh.h
index f133150847e,bd0504b038a..d9176a7f5fb
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@@ -22,15 -22,10 +22,15 @@@
  
  #include "bmesh_class.h"
  
 +typedef enum {
 +  MULTIRES_SPACE_TANGENT,  // convert absolute to tangent
 +  MULTIRES_SPACE_ABSOLUTE  // convert tangent to absolute
 +} MultiResSpace;
 +
  struct BMAllocTemplate;
  struct BMLoopNorEditDataArray;
- struct MLoopNorSpaceArray;
  struct BMPartialUpdate;
+ struct MLoopNorSpaceArray;
  
  void BM_mesh_elem_toolflags_ensure(BMesh *bm);
  void BM_mesh_elem_toolflags_clear(BMesh *bm);
diff --cc source/blender/bmesh/intern/bmesh_polygon.h
index 25efb6e1aca,5be7f4a5f3b..543b2eb9c8c
--- a/source/blender/bmesh/intern/bmesh_polygon.h
+++ b/source/blender/bmesh/intern/bmesh_polygon.h
@@@ -20,11 -20,10 +20,11 @@@
   * \ingroup bmesh
   */
  
- struct Heap;
  struct BMPartialUpdate;
+ struct Heap;
  
  #include "BLI_compiler_attrs.h"
 +#include "BLI_compiler_compat.h"
  
  void BM_face_calc_tessellation(const BMFace *f,
                                 const bool use_fixed_quad,
diff --cc source/blender/editors/mesh/editmesh_undo.c
index 512481cdbfe,fc9e1aa8b1a..8dc7a1d7675
--- a/source/blender/editors/mesh/editmesh_undo.c
+++ b/source/blender/editors/mesh/editmesh_undo.c
@@@ -678,10 -679,11 +679,11 @@@ static void undomesh_to_editmesh(UndoMe
                            .use_toolflags = true,
                        }));
  
 -  BM_mesh_bm_from_me(bm,
 +  BM_mesh_bm_from_me(NULL, bm,
                       &um->me,
                       (&(struct BMeshFromMeshParams){
-                          .calc_face_normal = true,
+                          /* Handled with tessellation. */
+                          .calc_face_normal = false,
                           .active_shapekey = um->shapenr,
                       }));
  
diff --cc source/blender/editors/sculpt_paint/sculpt_smooth.c
index 82818632782,eabbfe43e03..6a37fd55562
--- a/source/blender/editors/sculpt_paint/sculpt_smooth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_smooth.c
@@@ -663,20 -366,8 +663,20 @@@ void SCULPT_smooth(Sculpt *sd
    count = (int)(bstrength * max_iterations);
    last = max_iterations * (bstrength - count * fract);
  
 +  SculptCustomLayer scl;
 +#if 0
 +  bool have_scl = smooth_mask ? false :
 +                                SCULPT_temp_customlayer_ensure(
 +                                    ss, ATTR_DOMAIN_POINT, CD_PROP_FLOAT3, "__scl_smooth_vel");
 +  if (have_scl) {
 +    SCULPT_temp_customlayer_get(ss, ATTR_DOMAIN_POINT, CD_PROP_FLOAT3, "__scl_smooth_vel", &scl);
 +  }
 +#else
 +  bool have_scl = false;
 +#endif
 +
    if (type == PBVH_FACES && !ss->pmap) {
-     BLI_assert(!"sculpt smooth: pmap missing");
+     BLI_assert_msg(0, "sculpt smooth: pmap missing");
      return;
    }
  
diff --cc source/blender/modifiers/intern/MOD_wireframe.c
index c294b8f69ba,e188a61e975..55fcfed8e98
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@@ -76,9 -76,9 +76,9 @@@ static Mesh *WireframeModifier_do(Wiref
    Mesh *result;
    BMesh *bm;
  
-   const int defgrp_index = BKE_object_defgroup_name_index(ob, wmd->defgrp_name);
+   const int defgrp_index = BKE_id_defgroup_name_index(&mesh->id, wmd->defgrp_name);
  
 -  bm = BKE_mesh_to_bmesh_ex(mesh,
 +  bm = BKE_mesh_to_bmesh_ex(ob, mesh,
                              &(struct BMeshCreateParams){0},
                              &(struct BMeshFromMeshParams){
                                  .calc_face_normal = true,