* Removed now-unused SCULPT_TOOL_ entries.
* Removed BLI_even_spline.h.
* Removed some changes to the pose brush.
* Cleaned up some brush flags.

@@ -64,3 +64,3 @@
 ATOMIC_INLINE uint64_t atomic_add_and_fetch_uint64(uint64_t *p, uint64_t x)
 {
-  return InterlockedExchangeAdd64((int64_t *)p, (int64_t)x) + x;
+  return (uint64_t)InterlockedExchangeAdd64((int64_t *)p, (int64_t)x) + x;

@@ -735,6 +961,12 @@ typedef struct SculptSession {
    */
   char needs_flush_to_id;
 
+  // id of current stroke, used to detect

@@ -2,2 +2,4 @@
  * Copyright 2008 Blender Foundation */
 
+#ifdef __GNUC__
+/* I can't even *cast* signed ints in gcc's sign-conversion warning? gcc 10.3.0 -joeedh */

@@ -4,0 +7,4 @@
+#endif
+
+#ifdef __GNUC__
+/* I can't even *cast* signed ints in gcc's sign-conversion warning? gcc 10.3.0 -joeedh */

@@ -6851,2 +6851,4 @@
         row.prop(overlay, "sculpt_mode_face_sets_opacity", text="Face Sets")
 
+        row = layout.row(align=True)
+        row.prop(overlay, "show_sculpt_ids")

@@ -898,0 +949,4 @@
+            "detail_range"
+        )
+
+        if 0:

@@ -1691,3 +1691,3 @@
     }
     else {
-      if (FT_Set_Char_Size(font->face, 0, ft_size, BLF_DPI, BLF_DPI) != FT_Err_Ok) {
+      if (FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)ft_size, BLF_DPI, BLF_DPI) != FT_Err_Ok) {

@@ -206,6 +210,19 @@ bool BKE_brush_has_cube_tip(const struct Brush *brush, ePaintMode paint_mode);
 /* debugging only */
 void BKE_brush_debug_print_state(struct Brush *br);
 
+void BKE_brush_get_dyntopo(struct Brush *brush, struct Sculpt *sd, struct DynTopoSettings *out);

@@ -121,6 +121,8 @@ bool CustomData_has_interp(const struct CustomData *data);
  */
 bool CustomData_bmesh_has_free(const struct CustomData *data);
 
+bool CustomData_layout_is_same(const struct CustomData *_a, const struct CustomData *_b);

@@ -174,6 +179,10 @@ void CustomData_copy_layout(const struct CustomData *source,
 /* BMESH_TODO, not really a public function but readfile.c needs it */
 void CustomData_update_typemap(struct CustomData *data);
 
+/* copies all customdata layers without allocating data,

@@ -0,0 +125,4 @@
+  PBVH_None = 0,
+  PBVH_Subdivide = 1 << 0,
+  PBVH_Collapse = 1 << 1,
+  PBVH_Cleanup = 1 << 2,  // dissolve verts surrounded by either 3 or 4 triangles then triangulate

@@ -640,1 +716,4 @@
   struct BMesh *bm;
+  struct BMIdMap *bm_idmap;
+
+  /* TODO: get rid of these cd_ members and use

@@ -116,0 +144,4 @@
+#ifdef __cplusplus
+  blender::Map<uintptr_t, int> vertmap;
+#else
+  void *vertmap;

@@ -320,0 +400,4 @@
+BMLog *BKE_pbvh_get_bm_log(PBVH *pbvh);
+
+/**
+checks if original data needs to be updated for v, and if so updates it.  Stroke_id

@@ -691,2 +800,4 @@
   ((void)0)
 
+#define BKE_pbvh_vertex_to_index(pbvh, v) \
+  (BKE_pbvh_type(pbvh) == PBVH_BMESH && v.i != -1 ? BM_elem_index_get((BMVert *)(v.i)) : (v.i))

@@ -818,0 +947,4 @@
+int BKE_pbvh_get_node_id(PBVH *pbvh, PBVHNode *node);
+void BKE_pbvh_set_flat_vcol_shading(PBVH *pbvh, bool value);
+
+void SCULPT_update_flat_vcol_shading(struct Object *ob, struct Scene *scene);

@@ -818,0 +1012,4 @@
+void BKE_pbvh_get_vert_face_areas(PBVH *pbvh, PBVHVertRef vertex, float *r_areas, int valence);
+void BKE_pbvh_set_symmetry(PBVH *pbvh, int symmetry, int boundary_symmetry);
+
+#if 0

@@ -818,0 +1117,4 @@
+#  include <float.h>
+#  include <math.h>
+
+/* Why is atomic_ops defining near & far macros? */

@@ -770,6 +778,16 @@ if(WITH_OPENVDB)
   add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
 endif()
 
+if(WITH_INSTANT_MESHES)

@@ -56,6 +57,9 @@ const char *no_procedural_access_message = N_(
 
 bool allow_procedural_attribute_access(StringRef attribute_name)
 {
+  if (G.debug_value == 892) {

@@ -79,0 +95,4 @@
+  a.layers = b.layers = nullptr;
+  a.pool = b.pool = nullptr;
+
+  if (memcmp((void *)&a, (void *)&b, sizeof(CustomData)) != 0) {

@@ -79,0 +106,4 @@
+    cla.data = clb.data = nullptr;
+    cla.default_data = clb.default_data = nullptr;
+
+    if (memcmp((void *)&cla, (void *)&clb, sizeof(CustomDataLayer)) != 0) {

@@ -60,3 +60,2 @@
 #else
-#  define BLI_assert(a) ((void)0)
-#  define BLI_assert_msg(a, msg) ((void)0)
+#  define BLI_assert(a) ((void *)0)

@@ -18,2 +18,4 @@
  * if no arguments are given to the macro, all of pointer
  * arguments would be expected to be non-null
+ *
+ * ONE-INDEXED!

@@ -83,6 +89,17 @@
 #  define ATTR_ALIGN(x) __attribute__((aligned(x)))
 #endif
 
+/* Disable optimization for a function (for debugging use only!)*/

@@ -163,3 +163,3 @@
 void **BLI_ghash_lookup_p(GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT;
 /**
- * Ensure \a key is exists in \a gh.
+ * Lookup a pointer to the value of \a key in \a gh.

@@ -339,6 +354,73 @@ BLI_INLINE bool BLI_ghashIterator_done(const GHashIterator *ghi)
 
 typedef struct GSet GSet;
 
+typedef struct TableGSet {

@@ -0,0 +19,4 @@
+//#define BLI_MINMAX_HEAP_VALIDATE
+
+namespace blender {
+template<typename Value, typename NodeType> class HeapValueIter {

@@ -35,1 +30,3 @@
-#  pragma warning(error : 4389) /* signed/unsigned mismatch */
+/* While regular clang defines __GNUC__ and is handled by the code above, clang-cl does not and
+ * needs to be handled separately. */
+#  ifdef __clang__

@@ -858,3 +858,3 @@
 #define BLI_ENABLE_IF(condition) typename std::enable_if_t<(condition)> * = nullptr
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)

@@ -752,6 +752,45 @@ void **BLI_ghash_lookup_p(GHash *gh, const void *key)
   return e ? &e->val : NULL;
 }
 
+/**

@@ -755,0 +778,4 @@
+}
+
+/**
+ * Ensure \a key is exists in \a gh.

@@ -4307,6 +4309,159 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
     }
   }
 
+  if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "hard_corner_pin")) {

@@ -571,3 +571,3 @@
       !cache_settings_equal(csmd) ||
       ((csmd->rest_source == MOD_CORRECTIVESMOOTH_RESTSOURCE_ORCO) &&
-       (((ID *)ob->data)->recalc & ID_RECALC_ALL));
+       (((ID *)ob->data)->recalc & (unsigned int)ID_RECALC_ALL));

@@ -29,6 +29,7 @@ set(INC
   ../makesrna
   ../render
   ../windowmanager
+  ../../../intern/atomic

@@ -87,6 +87,7 @@ static Mesh *create_ico_sphere_mesh(const int subdivisions,
   Mesh *mesh = reinterpret_cast<Mesh *>(BKE_id_new_nomain(ID_ME, nullptr));
   BKE_id_material_eval_ensure_default_slot(&mesh->id);
   BM_mesh_bm_to_me(nullptr, bm, mesh, &params);
+

@@ -15,6 +15,7 @@ set(INC
   ../../render
   ../../windowmanager
   ../../../../intern/guardedalloc
+  ../../../../intern/atomic

@@ -35,6 +35,7 @@ struct ImBuf;
 struct ImageFormatData;
 struct Main;
 struct MenuType;
+struct PBVH;

@@ -27,6 +27,8 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_paint.h"

@@ -2052,1 +2055,3 @@
-static void wm_autosave_write(Main *bmain, wmWindowManager *wm)
+/* TODO: Move to appropriate headers */
+void ED_sculpt_fast_save_bmesh(Object *ob);
+struct MemFileUndoStep;

@@ -2061,0 +2078,4 @@
+      ED_sculpt_fast_save_bmesh(ob);
+    }
+    else {
+      multires_flush_sculpt_updates(ob);

@@ -2,6 +2,7 @@
 # Copyright 2006 Blender Foundation
 
 set(INC
+  ../../intern/atomic

@@ -327,3 +328,3 @@
 
     /* free on early-exit */
-    app_init_data.argv = argv;
+    app_init_data.argv = (const char **)argv;