[Bf-blender-cvs] [83c491f044d] temp_bmesh_multires: Merge branch 'master' into temp_bmesh_multires

[Joseph Eagar]

Commit: 83c491f044db0072143801b03aded573ed7093f9
Author: Joseph Eagar
Date:   Sat Jun 26 13:00:26 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB83c491f044db0072143801b03aded573ed7093f9

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc .clang-format
index 55a45965fbd,bf20a4e4c4a..8e2bb41bb3a
--- a/.clang-format
+++ b/.clang-format
@@@ -263,7 -263,7 +263,8 @@@ ForEachMacros
    - SET_SLOT_PROBING_BEGIN
    - MAP_SLOT_PROBING_BEGIN
    - VECTOR_SET_SLOT_PROBING_BEGIN
 +  - TGSET_ITER
  
  StatementMacros:
+   - PyObject_HEAD
    - PyObject_VAR_HEAD
diff --cc release/datafiles/locale
index ab283053ab4,4833954c0ac..78591466c33
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit ab283053ab455f76f5620b59b823e73bd9f601ce
 -Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
++Subproject commit 78591466c335ab055e11729d8af814ce7ce6edc9
diff --cc source/blender/blenkernel/intern/curve_bevel.c
index 0b9cd7affdf,d205d8cca46..f853e584537
--- a/source/blender/blenkernel/intern/curve_bevel.c
+++ b/source/blender/blenkernel/intern/curve_bevel.c
@@@ -97,10 -97,10 +97,10 @@@ static void curve_bevel_make_extrude_an
     * in a consistent direction.
     *
     * These should be small enough for stack allocations because the current limit
-    * for #Curve.bevresol is 32.  */
+    * for #Curve.bevresol is 32. */
    float *quarter_coords_x = alloca(sizeof(float) * (cu->bevresol + 1));
    float *quarter_coords_y = alloca(sizeof(float) * (cu->bevresol + 1));
 -  bevel_quarter_fill(cu, quarter_coords_x, quarter_coords_y);
 +  bevel_quarter_fill((Curve *)cu, quarter_coords_x, quarter_coords_y);
  
    int nr;
    if (fill_type == FULL) {
diff --cc source/blender/blenkernel/intern/paint.c
index 2c830e92142,a7c6dc2deb9..708fbae0d49
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@@ -1823,10 -1810,10 +1823,10 @@@ void BKE_sculpt_color_layer_create_if_n
  
    CustomData_add_layer(&orig_me->vdata, CD_PROP_COLOR, CD_DEFAULT, NULL, orig_me->totvert);
    BKE_mesh_update_customdata_pointers(orig_me, true);
-   DEG_id_tag_update(&orig_me->id, ID_RECALC_GEOMETRY);
+   DEG_id_tag_update(&orig_me->id, ID_RECALC_GEOMETRY_ALL_MODES);
 +  SCULPT_dynamic_topology_sync_layers(object, orig_me);
  }
  
 -/** \warning Expects a fully evaluated depsgraph. */
  void BKE_sculpt_update_object_for_edit(
      Depsgraph *depsgraph, Object *ob_orig, bool need_pmap, bool need_mask, bool need_colors)
  {
diff --cc source/blender/bmesh/intern/bmesh_mesh_convert.c
index 216a580a8d1,9d29a90a7a4..ad82d5d69aa
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.c
@@@ -1076,13 -1001,8 +1076,13 @@@ void BM_mesh_bm_to_me
    /* Topology could be changed, ensure #CD_MDISPS are ok. */
    multires_topology_changed(me);
  
-   /* To be removed as soon as COW is enabled by default.. */
+   /* To be removed as soon as COW is enabled by default. */
    BKE_mesh_runtime_clear_geometry(me);
 +
 +  
 +  if (params && params->copy_temp_cdlayers) {
 +    bm_mark_temp_cdlayers(bm);
 +  }
  }
  
  /**
diff --cc source/blender/editors/sculpt_paint/paint_image_proj.c
index 87d9a50aab9,88140460f5b..7f01d7f437a
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@@ -1105,16 -1103,7 +1107,16 @@@ static bool pixel_bounds_array
    bounds_px->xmax = (int)(ibuf_x * max_uv[0]) + 1;
    bounds_px->ymax = (int)(ibuf_y * max_uv[1]) + 1;
  
 +  const int d = -1000;
 +  if (bounds_px->xmin < d || bounds_px->ymin < d || bounds_px->xmax < d || bounds_px->ymax < d) {
 +    printf("error! xmin %d xmax %d ymin %d ymax %d\n",
 +           bounds_px->xmin,
 +           bounds_px->xmax,
 +           bounds_px->ymin,
 +           bounds_px->ymax);
 +  }
 +
-   /*printf("%d %d %d %d\n", min_px[0], min_px[1], max_px[0], max_px[1]);*/
+   // printf("%d %d %d %d\n", min_px[0], min_px[1], max_px[0], max_px[1]);
  
    /* face uses no UV area when quantized to pixels? */
    return (bounds_px->xmin == bounds_px->xmax || bounds_px->ymin == bounds_px->ymax) ? false : true;
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 533de9936b3,ab5c46f4bc5..d1487acee78
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -1791,13 -1146,12 +1791,12 @@@ void SCULPT_floodfill_add_active
        v = SCULPT_active_vertex_get(ss);
      }
      else if (radius > 0.0f) {
-       float radius_squared = (radius == FLT_MAX) ? FLT_MAX : radius * radius;
        float location[3];
        flip_v3_v3(location, SCULPT_active_vertex_co_get(ss), i);
-       v = SCULPT_nearest_vertex_get(sd, ob, location, radius_squared, false);
+       v = SCULPT_nearest_vertex_get(sd, ob, location, radius, false);
      }
  
 -    if (v != -1) {
 +    if (v.i != -1) {
        SCULPT_floodfill_add_initial(flood, v);
      }
    }
diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
index e37acad666c,ae02097707c..74fb8a3e169
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@@ -2906,10 -2905,10 +2906,10 @@@ void ED_uvedit_add_simple_uvs(Main *bma
    /* select all uv loops first - pack parameters needs this to make sure charts are registered */
    ED_uvedit_select_all(bm);
    uvedit_unwrap_cube_project(bm, 1.0, false, NULL);
-   /* set the margin really quickly before the packing operation*/
+   /* Set the margin really quickly before the packing operation. */
    scene->toolsettings->uvcalc_margin = 0.001f;
    uvedit_pack_islands(scene, ob, bm);
 -  BM_mesh_bm_to_me(bmain, bm, me, (&(struct BMeshToMeshParams){0}));
 +  BM_mesh_bm_to_me(bmain, NULL, bm, me, (&(struct BMeshToMeshParams){0}));
    BM_mesh_free(bm);
  
    if (sync_selection) {
diff --cc source/blender/makesdna/DNA_customdata_types.h
index 973cf033305,e5282409329..0414128f6d0
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@@ -72,10 -72,10 +72,10 @@@ typedef struct CustomData 
    CustomDataLayer *layers;
    /**
     * runtime only! - maps types to indices of first layer of that type,
-    * MUST be >= CD_NUMTYPES, but we cant use a define here.
+    * MUST be >= CD_NUMTYPES, but we can't use a define here.
     * Correct size is ensured in CustomData_update_typemap assert().
     */
 -  int typemap[51];
 +  int typemap[52];
    /** Number of layers, size of layers array. */
    int totlayer, maxlayer;
    /** In editmode, total size of all data layers. */