[Bf-blender-cvs] [30691560fa9] sculpt-dev: Fix C++20 designated initializer build issue.

Ankit Meel noreply at git.blender.org
Thu Aug 26 17:26:31 CEST 2021


Commit: 30691560fa90461a78f8229ca064601128b2621a
Author: Ankit Meel
Date:   Thu Aug 26 20:56:13 2021 +0530
Branches: sculpt-dev
https://developer.blender.org/rB30691560fa90461a78f8229ca064601128b2621a

Fix C++20 designated initializer build issue.

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

M	source/blender/blenkernel/intern/mesh_remesh_voxel.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
index b77f18954b1..9651e2d2f01 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
@@ -344,9 +344,8 @@ void BKE_mesh_remesh_sculpt_array_update(Object *ob, Mesh *target, Mesh *source)
     return;
   }
 
-  BVHTreeFromMesh bvhtree = {
-      .nearest_callback = NULL,
-  };
+  BVHTreeFromMesh bvhtree = {nullptr};
+  bvhtree.nearest_callback = nullptr;
   BKE_bvhtree_from_mesh_get(&bvhtree, source, BVHTREE_FROM_VERTS, 2);
   MVert *target_verts = (MVert *)CustomData_get_layer(&target->vdata, CD_MVERT);
 
@@ -452,9 +451,8 @@ void BKE_remesh_reproject_sculpt_face_sets(Mesh *target, Mesh *source)
 
 void BKE_remesh_reproject_materials(Mesh *target, Mesh *source)
 {
-  BVHTreeFromMesh bvhtree = {
-      .nearest_callback = NULL,
-  };
+  BVHTreeFromMesh bvhtree = {nullptr};
+  bvhtree.nearest_callback = nullptr;
 
   const MPoly *target_polys = (MPoly *)CustomData_get_layer(&target->pdata, CD_MPOLY);
   const MVert *target_verts = (MVert *)CustomData_get_layer(&target->vdata, CD_MVERT);



More information about the Bf-blender-cvs mailing list