[Bf-blender-cvs] [77829369771] master: BMesh: support copying & freeing layers by type
Campbell Barton
noreply at git.blender.org
Tue Nov 26 06:31:25 CET 2019
Commit: 77829369771e1cb44bd85c5a4abdda02f6f42103
Author: Campbell Barton
Date: Tue Nov 26 16:19:56 2019 +1100
Branches: master
https://developer.blender.org/rB77829369771e1cb44bd85c5a4abdda02f6f42103
BMesh: support copying & freeing layers by type
===================================================================
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/intern/customdata.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_construct.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index f5665707a0c..a4a36343ca3 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -258,6 +258,11 @@ void CustomData_bmesh_copy_data(const struct CustomData *source,
struct CustomData *dest,
void *src_block,
void **dest_block);
+void CustomData_bmesh_copy_data_exclude_by_type(const struct CustomData *source,
+ struct CustomData *dest,
+ void *src_block,
+ void **dest_block,
+ const CustomDataMask mask_exclude);
/* Copies data of a single layer of a given type. */
void CustomData_copy_layer_type_data(const struct CustomData *source,
@@ -392,6 +397,9 @@ void CustomData_clear_layer_flag(struct CustomData *data, int type, int flag);
void CustomData_bmesh_set_default(struct CustomData *data, void **block);
void CustomData_bmesh_free_block(struct CustomData *data, void **block);
void CustomData_bmesh_free_block_data(struct CustomData *data, void *block);
+void CustomData_bmesh_free_block_data_exclude_by_type(struct CustomData *data,
+ void *block,
+ const CustomDataMask mask_exclude);
/* copy custom data to/from layers as in mesh/derivedmesh, to editmesh
* blocks of data. the CustomData's must not be compatible */
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8ac0f71cd7e..93db44ce60a 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3415,24 +3415,18 @@ void CustomData_bmesh_free_block(CustomData *data, void **block)
*/
void CustomData_bmesh_free_block_data(CustomData *data, void *block)
{
- const LayerTypeInfo *typeInfo;
- int i;
-
if (block == NULL) {
return;
}
-
- for (i = 0; i < data->totlayer; i++) {
+ for (int i = 0; i < data->totlayer; i++) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
- typeInfo = layerType_getInfo(data->layers[i].type);
-
+ const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[i].type);
if (typeInfo->free) {
const size_t offset = data->layers[i].offset;
typeInfo->free(POINTER_OFFSET(block, offset), 1, typeInfo->size);
}
}
}
-
if (data->totsize) {
memset(block, 0, data->totsize);
}
@@ -3453,6 +3447,30 @@ static void CustomData_bmesh_alloc_block(CustomData *data, void **block)
}
}
+/**
+ * A selective version of #CustomData_bmesh_free_block_data.
+ */
+void CustomData_bmesh_free_block_data_exclude_by_type(CustomData *data,
+ void *block,
+ const CustomDataMask mask_exclude)
+{
+ if (block == NULL) {
+ return;
+ }
+ for (int i = 0; i < data->totlayer; i++) {
+ if ((CD_TYPE_AS_MASK(data->layers[i].type) & mask_exclude) == 0) {
+ const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[i].type);
+ const size_t offset = data->layers[i].offset;
+ if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
+ if (typeInfo->free) {
+ typeInfo->free(POINTER_OFFSET(block, offset), 1, typeInfo->size);
+ }
+ }
+ memset(POINTER_OFFSET(block, offset), 0, typeInfo->size);
+ }
+ }
+}
+
static void CustomData_bmesh_set_default_n(CustomData *data, void **block, int n)
{
const LayerTypeInfo *typeInfo;
@@ -3481,12 +3499,15 @@ void CustomData_bmesh_set_default(CustomData *data, void **block)
}
}
-void CustomData_bmesh_copy_data(const CustomData *source,
- CustomData *dest,
- void *src_block,
- void **dest_block)
+void CustomData_bmesh_copy_data_exclude_by_type(const CustomData *source,
+ CustomData *dest,
+ void *src_block,
+ void **dest_block,
+ const CustomDataMask mask_exclude)
{
- const LayerTypeInfo *typeInfo;
+ /* Note that having a version of this function without a 'mask_exclude'
+ * would cause too much duplicate code, so add a check instead. */
+ const bool no_mask = (mask_exclude == 0);
int dest_i, src_i;
if (*dest_block == NULL) {
@@ -3519,13 +3540,14 @@ void CustomData_bmesh_copy_data(const CustomData *source,
const void *src_data = POINTER_OFFSET(src_block, source->layers[src_i].offset);
void *dest_data = POINTER_OFFSET(*dest_block, dest->layers[dest_i].offset);
- typeInfo = layerType_getInfo(source->layers[src_i].type);
-
- if (typeInfo->copy) {
- typeInfo->copy(src_data, dest_data, 1);
- }
- else {
- memcpy(dest_data, src_data, typeInfo->size);
+ if (no_mask || ((CD_TYPE_AS_MASK(dest->layers[dest_i].type) & mask_exclude) == 0)) {
+ const LayerTypeInfo *typeInfo = layerType_getInfo(source->layers[src_i].type);
+ if (typeInfo->copy) {
+ typeInfo->copy(src_data, dest_data, 1);
+ }
+ else {
+ memcpy(dest_data, src_data, typeInfo->size);
+ }
}
/* if there are multiple source & dest layers of the same type,
@@ -3542,6 +3564,14 @@ void CustomData_bmesh_copy_data(const CustomData *source,
}
}
+void CustomData_bmesh_copy_data(const CustomData *source,
+ CustomData *dest,
+ void *src_block,
+ void **dest_block)
+{
+ CustomData_bmesh_copy_data_exclude_by_type(source, dest, src_block, dest_block, 0);
+}
+
/* BMesh Custom Data Functions.
* Should replace edit-mesh ones with these as well, due to more efficient memory alloc.
*/
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index c8eab9c4b8c..592d8124b23 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -89,11 +89,8 @@ void BM_edges_from_verts_ensure(BMesh *bm, BMEdge **edge_arr, BMVert **vert_arr,
}
/* prototypes */
-static void bm_loop_attrs_copy(BMesh *source_mesh,
- BMesh *target_mesh,
- const BMLoop *source_loop,
- BMLoop *target_loop,
- uint64_t cd_mask);
+static void bm_loop_attrs_copy(
+ BMesh *bm_src, BMesh *bm_dst, const BMLoop *l_src, BMLoop *l_dst, CustomDataMask mask_exclude);
/**
* \brief Make Quad/Triangle
@@ -414,73 +411,59 @@ void BM_verts_sort_radial_plane(BMVert **vert_arr, int len)
/*************************************************************/
-static void bm_vert_attrs_copy(BMesh *source_mesh,
- BMesh *target_mesh,
- const BMVert *source_vertex,
- BMVert *target_vertex,
- uint64_t cd_mask)
+static void bm_vert_attrs_copy(
+ BMesh *bm_src, BMesh *bm_dst, const BMVert *v_src, BMVert *v_dst, CustomDataMask mask_exclude)
{
- if ((source_mesh == target_mesh) && (source_vertex == target_vertex)) {
+ if ((bm_src == bm_dst) && (v_src == v_dst)) {
BLI_assert(!"BMVert: source and target match");
return;
}
- if ((cd_mask & CD_MASK_NORMAL) == 0) {
- copy_v3_v3(target_vertex->no, source_vertex->no);
+ if ((mask_exclude & CD_MASK_NORMAL) == 0) {
+ copy_v3_v3(v_dst->no, v_src->no);
}
- CustomData_bmesh_free_block_data(&target_mesh->vdata, target_vertex->head.data);
- CustomData_bmesh_copy_data(&source_mesh->vdata,
- &target_mesh->vdata,
- source_vertex->head.data,
- &target_vertex->head.data);
+ CustomData_bmesh_free_block_data_exclude_by_type(&bm_dst->vdata, v_dst->head.data, mask_exclude);
+ CustomData_bmesh_copy_data_exclude_by_type(
+ &bm_src->vdata, &bm_dst->vdata, v_src->head.data, &v_dst->head.data, mask_exclude);
}
-static void bm_edge_attrs_copy(BMesh *source_mesh,
- BMesh *target_mesh,
- const BMEdge *source_edge,
- BMEdge *target_edge,
- uint64_t UNUSED(cd_mask))
+static void bm_edge_attrs_copy(
+ BMesh *bm_src, BMesh *bm_dst, const BMEdge *e_src, BMEdge *e_dst, CustomDataMask mask_exclude)
{
- if ((source_mesh == target_mesh) && (source_edge == target_edge)) {
+ if ((bm_src == bm_dst) && (e_src == e_dst)) {
BLI_assert(!"BMEdge: source and target match");
return;
}
- CustomData_bmesh_free_block_data(&target_mesh->edata, target_edge->head.data);
- CustomData_bmesh_copy_data(
- &source_mesh->edata, &target_mesh->edata, source_edge->head.data, &target_edge->head.data);
+ CustomData_bmesh_free_block_data_exclude_by_type(&bm_dst->edata, e_dst->head.data, mask_exclude);
+ CustomData_bmesh_copy_data_exclude_by_type(
+ &bm_src->edata, &bm_dst->edata, e_src->head.data, &e_dst->head.data, mask_exclude);
}
-static void bm_loop_attrs_copy(BMesh *source_mesh,
- BMesh *target_mesh,
- const BMLoop *source_loop,
- BMLoop *target_loop,
- uint64_t UNUSED(cd_mask))
+static void bm_loop_attrs_copy(
+ BMesh *bm_src, BMesh *bm_dst, const BMLoop *l_src, BMLoop *l_dst, CustomDataMask mask_exclude)
{
- if ((source_mesh == target_mesh) && (source_loop == target_loop)) {
+ if ((bm_src == bm_dst) && (l_src == l_dst)) {
BLI_assert(!"BMLoop: source and target match");
return;
}
- CustomData_bmesh_free_block_data(&target_mesh->ldata, target_loop->head.data)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list