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

[Joseph Eagar]

Commit: f0c35d16f39d837c7bceb6740d3fe9c440676564
Author: Joseph Eagar
Date:   Fri Sep 17 20:13:39 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBf0c35d16f39d837c7bceb6740d3fe9c440676564

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc source/blender/makesdna/intern/makesdna.c
index 6822c48380a,0b7848b6662..ecf8bfd0ab9
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@@ -141,8 -141,8 +141,9 @@@ static const char *includefiles[] = 
      "DNA_volume_types.h",
      "DNA_simulation_types.h",
      "DNA_pointcache_types.h",
+     "DNA_uuid_types.h",
      "DNA_asset_types.h",
 +    "DNA_sculpt_brush_types.h",
  
      /* see comment above before editing! */