griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unused CustomData functions

Browse Source
This commit is contained in:
Hans Goudey
2025-02-14 12:44:11 -05:00
parent c1866764b0
commit 7c3a3669b6
2 changed files with 0 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/BKE_customdata.hh
View File

@@ -123,11 +123,6 @@ bool CustomData_has_interp(const CustomData *data);
*/
bool CustomData_bmesh_has_free(const CustomData *data);
/**
* Checks if any of the custom-data layers is referenced.
*/
bool CustomData_has_referenced(const CustomData *data);
/**
* Copies the "value" (e.g. `mloopuv` UV or `mloopcol` colors) from one block to
* another, while not overwriting anything else (e.g. flags). probably only
@@ -241,11 +236,6 @@ void CustomData_reset(CustomData *data);
*/
void CustomData_free(CustomData *data, int totelem);
/**
* Same as #CustomData_free, but only frees layers which matches the given mask.
*/
void CustomData_free_typemask(CustomData *data, int totelem, eCustomDataMask mask);
/**
* Adds a layer of the given type to the #CustomData object. The new layer is initialized based on
* the given alloctype.
@@ -585,13 +575,11 @@ void CustomData_set_layer_stencil(CustomData *data, eCustomDataType type, int n)
void CustomData_set_layer_active_index(CustomData *data, eCustomDataType type, int n);
void CustomData_set_layer_render_index(CustomData *data, eCustomDataType type, int n);
void CustomData_set_layer_clone_index(CustomData *data, eCustomDataType type, int n);
void CustomData_set_layer_stencil_index(CustomData *data, eCustomDataType type, int n);
/**
* Adds flag to the layer flags.
*/
void CustomData_set_layer_flag(CustomData *data, eCustomDataType type, int flag);
void CustomData_clear_layer_flag(CustomData *data, eCustomDataType type, int flag);
void CustomData_bmesh_set_default(CustomData *data, void **block);
void CustomData_bmesh_free_block(CustomData *data, void **block);
@@ -601,12 +589,6 @@ void CustomData_bmesh_alloc_block(CustomData *data, void **block);
* Same as #CustomData_bmesh_free_block but zero the memory rather than freeing.
*/
void CustomData_bmesh_free_block_data(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,
eCustomDataMask mask_exclude);
/**
* Query info over types.

64
source/blender/blenkernel/intern/customdata.cc
View File

@@ -2724,24 +2724,6 @@ void CustomData_free(CustomData *data, const int totelem)
CustomData_reset(data);
}
void CustomData_free_typemask(CustomData *data, const int totelem, eCustomDataMask mask)
{
for (int i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &data->layers[i];
if (!(mask & CD_TYPE_AS_MASK(layer->type))) {
continue;
}
customData_free_layer__internal(layer, totelem);
}
if (data->layers) {
MEM_freeN(data->layers);
}
CustomData_external_free(data);
CustomData_reset(data);
}
static void customData_update_offsets(CustomData *data)
{
const LayerTypeInfo *typeInfo;
@@ -3001,22 +2983,6 @@ void CustomData_set_layer_clone_index(CustomData *data, const eCustomDataType ty
}
}
void CustomData_set_layer_stencil_index(CustomData *data, const eCustomDataType type, const int n)
{
#ifndef NDEBUG
const int layer_num = CustomData_number_of_layers(data, type);
#endif
const int layer_index = n - data->typemap[type];
BLI_assert(customdata_typemap_is_valid(data));
for (int i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
BLI_assert(uint(layer_index) < uint(layer_num));
data->layers[i].active_mask = layer_index;
}
}
}
void CustomData_set_layer_flag(CustomData *data, const eCustomDataType type, const int flag)
{
for (int i = 0; i < data->totlayer; i++) {
@@ -3026,17 +2992,6 @@ void CustomData_set_layer_flag(CustomData *data, const eCustomDataType type, con
}
}
void CustomData_clear_layer_flag(CustomData *data, const eCustomDataType type, const int flag)
{
const int nflag = ~flag;
for (int i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].flag &= nflag;
}
}
}
bool CustomData_layer_is_anonymous(const CustomData *data, eCustomDataType type, int n)
{
const int layer_index = CustomData_get_layer_index_n(data, type, n);
@@ -3970,25 +3925,6 @@ void CustomData_bmesh_alloc_block(CustomData *data, void **block)
}
}
void CustomData_bmesh_free_block_data_exclude_by_type(CustomData *data,
void *block,
const eCustomDataMask mask_exclude)
{
if (block == nullptr) {
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(eCustomDataType(data->layers[i].type));
const size_t offset = data->layers[i].offset;
if (typeInfo->free) {
typeInfo->free(POINTER_OFFSET(block, offset), 1);
}
memset(POINTER_OFFSET(block, offset), 0, typeInfo->size);
}
}
}
void CustomData_data_set_default_value(const eCustomDataType type, void *elem)
{
const LayerTypeInfo *typeInfo = layerType_getInfo(type);