[Bf-blender-cvs] [2edb69f8a60] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: 2edb69f8a600847f195b88deceea5e980ecb61a7
Author: Hans Goudey
Date:   Mon Sep 12 21:47:59 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB2edb69f8a600847f195b88deceea5e980ecb61a7

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/blenkernel/intern/cdderivedmesh.c
index ab70596a739,0261b2d7674..e3dd26c0a20
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@@ -244,44 -244,3 +244,4 @@@ DerivedMesh *CDDM_from_mesh(Mesh *mesh
  {
    return cdDM_from_mesh_ex(mesh, CD_REFERENCE, &CD_MASK_MESH);
  }
- 
- DerivedMesh *CDDM_copy(DerivedMesh *source)
- {
-   CDDerivedMesh *cddm = cdDM_create("CDDM_copy cddm");
-   DerivedMesh *dm = &cddm->dm;
-   int numVerts = source->numVertData;
-   int numEdges = source->numEdgeData;
-   int numTessFaces = 0;
-   int numLoops = source->numLoopData;
-   int numPolys = source->numPolyData;
- 
-   /* NOTE: Don't copy tessellation faces if not requested explicitly. */
- 
-   /* ensure these are created if they are made on demand */
-   source->getVertDataArray(source, CD_ORIGINDEX);
-   source->getEdgeDataArray(source, CD_ORIGINDEX);
-   source->getPolyDataArray(source, CD_ORIGINDEX);
- 
-   /* this initializes dm, and copies all non mvert/medge/mface layers */
-   DM_from_template(dm, source, DM_TYPE_CDDM, numVerts, numEdges, numTessFaces, numLoops, numPolys);
-   dm->deformedOnly = source->deformedOnly;
-   dm->cd_flag = source->cd_flag;
- 
-   CustomData_copy_data(&source->vertData, &dm->vertData, 0, 0, numVerts);
-   CustomData_copy_data(&source->edgeData, &dm->edgeData, 0, 0, numEdges);
- 
-   /* now add mvert/medge/mface layers */
-   cddm->positions = source->dupVertArray(source);
-   cddm->medge = source->dupEdgeArray(source);
- 
-   CustomData_add_layer_named(
-       &dm->vertData, CD_PROP_FLOAT3, CD_ASSIGN, cddm->positions, numVerts, "position");
-   CustomData_add_layer(&dm->edgeData, CD_MEDGE, CD_ASSIGN, cddm->medge, numEdges);
- 
-   DM_DupPolys(source, dm);
- 
-   cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP);
-   cddm->mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
- 
-   return dm;
- }
++<<<<<<< HEAD
diff --cc source/blender/blenkernel/intern/pbvh_intern.h
index 91533994932,8ab56839f9c..00681e31c10
--- a/source/blender/blenkernel/intern/pbvh_intern.h
+++ b/source/blender/blenkernel/intern/pbvh_intern.h
@@@ -154,8 -154,9 +154,9 @@@ struct PBVH 
    /* NOTE: Normals are not `const` because they can be updated for drawing by sculpt code. */
    float (*vert_normals)[3];
    bool *hide_vert;
 -  struct MVert *verts;
 +  float (*positions)[3];
    const struct MPoly *mpoly;
+   bool *hide_poly;
    /** Material indices. Only valid for polygon meshes. */
    const int *material_indices;
    const struct MLoop *mloop;