From a58dc25b077bfacf88bcdb8077633f30a049b96a Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 10 Jun 2020 15:47:31 +0200 Subject: Cleanup: improve custom data type names This is related to T76659. This just renames data type names to `CD_PROP_STRING`, `CD_PROP_FLOAT` and `CD_PROP_INT32`. It makes them a bit more specific and removes unnecessary abbreviations. Reviewers: brecht Differential Revision: https://developer.blender.org/D7980 --- source/blender/blenkernel/intern/customdata.c | 8 ++--- .../blenkernel/intern/multires_unsubdivide.c | 20 +++++------ source/blender/bmesh/tools/bmesh_bevel.c | 11 +++--- source/blender/editors/mesh/editmesh_tools.c | 10 +++--- source/blender/editors/mesh/editmesh_utils.c | 10 +++--- .../blender/editors/sculpt_paint/sculpt_dyntopo.c | 22 ++++++------ source/blender/makesdna/DNA_customdata_types.h | 14 ++++---- source/blender/makesrna/intern/rna_mesh.c | 42 +++++++++++----------- .../blender/modifiers/intern/MOD_weighted_normal.c | 4 +-- .../python/bmesh/bmesh_py_types_customdata.c | 36 +++++++++---------- 10 files changed, 90 insertions(+), 87 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 331762eee49..7dd4d1178ef 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1549,7 +1549,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { layerCopyValue_normal}, /* 9: CD_FACEMAP */ {sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, layerDefault_fmap, NULL}, - /* 10: CD_PROP_FLT */ + /* 10: CD_PROP_FLOAT */ {sizeof(MFloatProperty), "MFloatProperty", 1, @@ -1560,9 +1560,9 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { NULL, NULL, layerValidate_propFloat}, - /* 11: CD_PROP_INT */ + /* 11: CD_PROP_INT32 */ {sizeof(MIntProperty), "MIntProperty", 1, N_("Int"), layerCopy_propInt, NULL, NULL, NULL}, - /* 12: CD_PROP_STR */ + /* 12: CD_PROP_STRING */ {sizeof(MStringProperty), "MStringProperty", 1, @@ -4289,7 +4289,7 @@ int CustomData_layertype_layers_max(const int type) static bool CustomData_is_property_layer(int type) { - if ((type == CD_PROP_FLT) || (type == CD_PROP_INT) || (type == CD_PROP_STR)) { + if ((type == CD_PROP_FLOAT) || (type == CD_PROP_INT32) || (type == CD_PROP_STRING)) { return true; } return false; diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.c b/source/blender/blenkernel/intern/multires_unsubdivide.c index e5000e7774f..6bd7b6b6a98 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.c +++ b/source/blender/blenkernel/intern/multires_unsubdivide.c @@ -896,14 +896,14 @@ static const char vname[] = "v_remap_index"; static void multires_unsubdivide_free_original_datalayers(Mesh *mesh) { - const int l_layer_index = CustomData_get_named_layer_index(&mesh->ldata, CD_PROP_INT, lname); + const int l_layer_index = CustomData_get_named_layer_index(&mesh->ldata, CD_PROP_INT32, lname); if (l_layer_index != -1) { - CustomData_free_layer(&mesh->ldata, CD_PROP_INT, mesh->totloop, l_layer_index); + CustomData_free_layer(&mesh->ldata, CD_PROP_INT32, mesh->totloop, l_layer_index); } - const int v_layer_index = CustomData_get_named_layer_index(&mesh->vdata, CD_PROP_INT, vname); + const int v_layer_index = CustomData_get_named_layer_index(&mesh->vdata, CD_PROP_INT32, vname); if (v_layer_index != -1) { - CustomData_free_layer(&mesh->vdata, CD_PROP_INT, mesh->totvert, v_layer_index); + CustomData_free_layer(&mesh->vdata, CD_PROP_INT32, mesh->totvert, v_layer_index); } } @@ -916,10 +916,10 @@ static void multires_unsubdivide_add_original_index_datalayers(Mesh *mesh) multires_unsubdivide_free_original_datalayers(mesh); int *l_index = CustomData_add_layer_named( - &mesh->ldata, CD_PROP_INT, CD_CALLOC, NULL, mesh->totloop, lname); + &mesh->ldata, CD_PROP_INT32, CD_CALLOC, NULL, mesh->totloop, lname); int *v_index = CustomData_add_layer_named( - &mesh->vdata, CD_PROP_INT, CD_CALLOC, NULL, mesh->totvert, vname); + &mesh->vdata, CD_PROP_INT32, CD_CALLOC, NULL, mesh->totvert, vname); /* Initialize these data-layer with the indices in the current mesh. */ for (int i = 0; i < mesh->totloop; i++) { @@ -951,7 +951,7 @@ static void multires_unsubdivide_prepare_original_bmesh_for_extract( bm_original_mesh, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false); /* Get the mapping data-layer. */ - context->base_to_orig_vmap = CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT, vname); + context->base_to_orig_vmap = CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT32, vname); /* Tag the base mesh vertices in the original mesh. */ for (int i = 0; i < base_mesh->totvert; i++) { @@ -1013,7 +1013,7 @@ static void multires_unsubdivide_extract_grids(MultiresUnsubdivideContext *conte int *orig_to_base_vmap = MEM_calloc_arrayN(sizeof(int), bm_original_mesh->totvert, "orig vmap"); int *base_to_orig_vmap = MEM_calloc_arrayN(sizeof(int), base_mesh->totvert, "base vmap"); - context->base_to_orig_vmap = CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT, vname); + context->base_to_orig_vmap = CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT32, vname); for (int i = 0; i < base_mesh->totvert; i++) { base_to_orig_vmap[i] = context->base_to_orig_vmap[i]; } @@ -1034,7 +1034,7 @@ static void multires_unsubdivide_extract_grids(MultiresUnsubdivideContext *conte multires_unsubdivide_add_original_index_datalayers(base_mesh); const int base_l_layer_index = CustomData_get_named_layer_index( - &base_mesh->ldata, CD_PROP_INT, lname); + &base_mesh->ldata, CD_PROP_INT32, lname); BMesh *bm_base_mesh = get_bmesh_from_mesh(base_mesh); BMIter iter, iter_a, iter_b; BMVert *v; @@ -1045,7 +1045,7 @@ static void multires_unsubdivide_extract_grids(MultiresUnsubdivideContext *conte /* Get the data-layer that contains the loops indices. */ const int base_l_offset = CustomData_get_n_offset( - &bm_base_mesh->ldata, CD_PROP_INT, base_l_layer_index); + &bm_base_mesh->ldata, CD_PROP_INT32, base_l_layer_index); /* Main loop for extracting the grids. Iterates over the base mesh vertices. */ BM_ITER_MESH (v, &iter, bm_base_mesh, BM_VERTS_OF_MESH) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 720eb34bda7..00b647555cf 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2220,14 +2220,15 @@ static void bevel_set_weighted_normal_face_strength(BMesh *bm, BevelParams *bp) int mode = bp->face_strength_mode; bool do_set_strength; const char *wn_layer_id = MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID; - int cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, wn_layer_id); + int cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT32, wn_layer_id); if (cd_prop_int_idx == -1) { - BM_data_layer_add_named(bm, &bm->pdata, CD_PROP_INT, wn_layer_id); - cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, wn_layer_id); + BM_data_layer_add_named(bm, &bm->pdata, CD_PROP_INT32, wn_layer_id); + cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT32, wn_layer_id); } - cd_prop_int_idx -= CustomData_get_layer_index(&bm->pdata, CD_PROP_INT); - const int cd_prop_int_offset = CustomData_get_n_offset(&bm->pdata, CD_PROP_INT, cd_prop_int_idx); + cd_prop_int_idx -= CustomData_get_layer_index(&bm->pdata, CD_PROP_INT32); + const int cd_prop_int_offset = CustomData_get_n_offset( + &bm->pdata, CD_PROP_INT32, cd_prop_int_idx); BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { fkind = get_face_kind(bp, f); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 684bb73dc0e..142bc119958 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -9372,14 +9372,14 @@ static int edbm_mod_weighted_strength_exec(bContext *C, wmOperator *op) BM_select_history_clear(bm); const char *layer_id = MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID; - int cd_prop_int_index = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, layer_id); + int cd_prop_int_index = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT32, layer_id); if (cd_prop_int_index == -1) { - BM_data_layer_add_named(bm, &bm->pdata, CD_PROP_INT, layer_id); - cd_prop_int_index = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, layer_id); + BM_data_layer_add_named(bm, &bm->pdata, CD_PROP_INT32, layer_id); + cd_prop_int_index = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT32, layer_id); } - cd_prop_int_index -= CustomData_get_layer_index(&bm->pdata, CD_PROP_INT); + cd_prop_int_index -= CustomData_get_layer_index(&bm->pdata, CD_PROP_INT32); const int cd_prop_int_offset = CustomData_get_n_offset( - &bm->pdata, CD_PROP_INT, cd_prop_int_index); + &bm->pdata, CD_PROP_INT32, cd_prop_int_index); BM_mesh_elem_index_ensure(bm, BM_FACE); diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index b5346a9061a..6c9973dc209 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1089,16 +1089,16 @@ void EDBM_verts_mirror_cache_begin_ex(BMEditMesh *em, if (r_index == NULL) { const char *layer_id = BM_CD_LAYER_ID; - em->mirror_cdlayer = CustomData_get_named_layer_index(&bm->vdata, CD_PROP_INT, layer_id); + em->mirror_cdlayer = CustomData_get_named_layer_index(&bm->vdata, CD_PROP_INT32, layer_id); if (em->mirror_cdlayer == -1) { - BM_data_layer_add_named(bm, &bm->vdata, CD_PROP_INT, layer_id); - em->mirror_cdlayer = CustomData_get_named_layer_index(&bm->vdata, CD_PROP_INT, layer_id); + BM_data_layer_add_named(bm, &bm->vdata, CD_PROP_INT32, layer_id); + em->mirror_cdlayer = CustomData_get_named_layer_index(&bm->vdata, CD_PROP_INT32, layer_id); } cd_vmirr_offset = CustomData_get_n_offset( &bm->vdata, - CD_PROP_INT, - em->mirror_cdlayer - CustomData_get_layer_index(&bm->vdata, CD_PROP_INT)); + CD_PROP_INT32, + em->mirror_cdlayer - CustomData_get_layer_index(&bm->vdata, CD_PROP_INT32)); bm->vdata.layers[em->mirror_cdlayer].flag |= CD_FLAG_TEMPORARY; } diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c index eefd8529dbf..f07d22ed639 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c @@ -114,29 +114,31 @@ void SCULPT_dyntopo_node_layers_add(SculptSession *ss) char layer_id[] = "_dyntopo_node_id"; - cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->vdata, CD_PROP_INT, layer_id); + cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->vdata, CD_PROP_INT32, layer_id); if (cd_node_layer_index == -1) { - BM_data_layer_add_named(ss->bm, &ss->bm->vdata, CD_PROP_INT, layer_id); - cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->vdata, CD_PROP_INT, layer_id); + BM_data_layer_add_named(ss->bm, &ss->bm->vdata, CD_PROP_INT32, layer_id); + cd_node_layer_index = CustomData_get_named_layer_index( + &ss->bm->vdata, CD_PROP_INT32, layer_id); } ss->cd_vert_node_offset = CustomData_get_n_offset( &ss->bm->vdata, - CD_PROP_INT, - cd_node_layer_index - CustomData_get_layer_index(&ss->bm->vdata, CD_PROP_INT)); + CD_PROP_INT32, + cd_node_layer_index - CustomData_get_layer_index(&ss->bm->vdata, CD_PROP_INT32)); ss->bm->vdata.layers[cd_node_layer_index].flag |= CD_FLAG_TEMPORARY; - cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->pdata, CD_PROP_INT, layer_id); + cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->pdata, CD_PROP_INT32, layer_id); if (cd_node_layer_index == -1) { - BM_data_layer_add_named(ss->bm, &ss->bm->pdata, CD_PROP_INT, layer_id); - cd_node_layer_index = CustomData_get_named_layer_index(&ss->bm->pdata, CD_PROP_INT, layer_id); + BM_data_layer_add_named(ss->bm, &ss->bm->pdata, CD_PROP_INT32, layer_id); + cd_node_layer_index = CustomData_get_named_layer_index( + &ss->bm->pdata, CD_PROP_INT32, layer_id); } ss->cd_face_node_offset = CustomData_get_n_offset( &ss->bm->pdata, - CD_PROP_INT, - cd_node_layer_index - CustomData_get_layer_index(&ss->bm->pdata, CD_PROP_INT)); + CD_PROP_INT32, + cd_node_layer_index - CustomData_get_layer_index(&ss->bm->pdata, CD_PROP_INT32)); ss->bm->pdata.layers[cd_node_layer_index].flag |= CD_FLAG_TEMPORARY; } diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index ef3b2015758..e4999fd4464 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -108,9 +108,9 @@ typedef enum CustomDataType { CD_ORIGINDEX = 7, CD_NORMAL = 8, CD_FACEMAP = 9, /* exclusive face group, each face can only be part of one */ - CD_PROP_FLT = 10, - CD_PROP_INT = 11, - CD_PROP_STR = 12, + CD_PROP_FLOAT = 10, + CD_PROP_INT32 = 11, + CD_PROP_STRING = 12, CD_ORIGSPACE = 13, /* for modifier stack face location mapping */ CD_ORCO = 14, /* undeformed vertex coordinates, normalized to 0..1 range */ #ifdef DNA_DEPRECATED_ALLOW @@ -170,9 +170,9 @@ typedef enum CustomDataType { #define CD_MASK_ORIGINDEX (1 << CD_ORIGINDEX) #define CD_MASK_NORMAL (1 << CD_NORMAL) #define CD_MASK_FACEMAP (1 << CD_FACEMAP) -#define CD_MASK_PROP_FLT (1 << CD_PROP_FLT) -#define CD_MASK_PROP_INT (1 << CD_PROP_INT) -#define CD_MASK_PROP_STR (1 << CD_PROP_STR) +#define CD_MASK_PROP_FLOAT (1 << CD_PROP_FLOAT) +#define CD_MASK_PROP_INT32 (1 << CD_PROP_INT32) +#define CD_MASK_PROP_STRING (1 << CD_PROP_STRING) #define CD_MASK_ORIGSPACE (1 << CD_ORIGSPACE) #define CD_MASK_ORCO (1 << CD_ORCO) // #define CD_MASK_MTEXPOLY (1 << CD_MTEXPOLY) /* DEPRECATED */ @@ -208,7 +208,7 @@ typedef enum CustomDataType { #define CD_MASK_PROP_COLOR (1LL << CD_PROP_COLOR) /** Data types that may be defined for all mesh elements types. */ -#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR) +#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING) /** Multires loop data. */ #define CD_MASK_MULTIRES_GRIDS (CD_MASK_MDISPS | CD_GRID_PAINT_MASK) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 54539924fde..5f986c28964 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -761,7 +761,7 @@ static void rna_MeshLoopColorLayer_active_set(PointerRNA *ptr, bool value) static int rna_float_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) { CustomDataLayer *layer = (CustomDataLayer *)data; - return (layer->type != CD_PROP_FLT); + return (layer->type != CD_PROP_FLOAT); } static void rna_Mesh_vertex_float_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -787,17 +787,17 @@ static void rna_Mesh_polygon_float_layers_begin(CollectionPropertyIterator *iter static int rna_Mesh_vertex_float_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_FLT); + return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_FLOAT); } static int rna_Mesh_polygon_float_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_FLT); + return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_FLOAT); } static int rna_int_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) { CustomDataLayer *layer = (CustomDataLayer *)data; - return (layer->type != CD_PROP_INT); + return (layer->type != CD_PROP_INT32); } static void rna_Mesh_vertex_int_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -823,17 +823,17 @@ static void rna_Mesh_polygon_int_layers_begin(CollectionPropertyIterator *iter, static int rna_Mesh_vertex_int_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_INT); + return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_INT32); } static int rna_Mesh_polygon_int_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_INT); + return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_INT32); } static int rna_string_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) { CustomDataLayer *layer = (CustomDataLayer *)data; - return (layer->type != CD_PROP_STR); + return (layer->type != CD_PROP_STRING); } static void rna_Mesh_vertex_string_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -859,11 +859,11 @@ static void rna_Mesh_polygon_string_layers_begin(CollectionPropertyIterator *ite static int rna_Mesh_vertex_string_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_STR); + return CustomData_number_of_layers(rna_mesh_vdata(ptr), CD_PROP_STRING); } static int rna_Mesh_polygon_string_layers_length(PointerRNA *ptr) { - return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_STR); + return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_STRING); } /* Skin vertices */ @@ -1236,11 +1236,11 @@ static char *rna_MeshPolygonFloatPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshVertexFloatProperty_path(PointerRNA *ptr) { - return rna_VertCustomData_data_path(ptr, "vertex_layers_float", CD_PROP_FLT); + return rna_VertCustomData_data_path(ptr, "vertex_layers_float", CD_PROP_FLOAT); } static char *rna_MeshPolygonFloatProperty_path(PointerRNA *ptr) { - return rna_PolyCustomData_data_path(ptr, "polygon_layers_float", CD_PROP_FLT); + return rna_PolyCustomData_data_path(ptr, "polygon_layers_float", CD_PROP_FLOAT); } static void rna_MeshVertexFloatPropertyLayer_data_begin(CollectionPropertyIterator *iter, @@ -1287,11 +1287,11 @@ static char *rna_MeshPolygonIntPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshVertexIntProperty_path(PointerRNA *ptr) { - return rna_VertCustomData_data_path(ptr, "vertex_layers_int", CD_PROP_INT); + return rna_VertCustomData_data_path(ptr, "vertex_layers_int", CD_PROP_INT32); } static char *rna_MeshPolygonIntProperty_path(PointerRNA *ptr) { - return rna_PolyCustomData_data_path(ptr, "polygon_layers_int", CD_PROP_INT); + return rna_PolyCustomData_data_path(ptr, "polygon_layers_int", CD_PROP_INT32); } static void rna_MeshVertexIntPropertyLayer_data_begin(CollectionPropertyIterator *iter, @@ -1338,11 +1338,11 @@ static char *rna_MeshPolygonStringPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshVertexStringProperty_path(PointerRNA *ptr) { - return rna_VertCustomData_data_path(ptr, "vertex_layers_string", CD_PROP_STR); + return rna_VertCustomData_data_path(ptr, "vertex_layers_string", CD_PROP_STRING); } static char *rna_MeshPolygonStringProperty_path(PointerRNA *ptr) { - return rna_PolyCustomData_data_path(ptr, "polygon_layers_string", CD_PROP_STR); + return rna_PolyCustomData_data_path(ptr, "polygon_layers_string", CD_PROP_STRING); } static void rna_MeshVertexStringPropertyLayer_data_begin(CollectionPropertyIterator *iter, @@ -1458,17 +1458,17 @@ static void rna_Mesh_vertex_color_remove(struct Mesh *me, } DEFINE_CUSTOMDATA_PROPERTY_API( - vertex, float, CD_PROP_FLT, vdata, totvert, MeshVertexFloatPropertyLayer) + vertex, float, CD_PROP_FLOAT, vdata, totvert, MeshVertexFloatPropertyLayer) DEFINE_CUSTOMDATA_PROPERTY_API( - vertex, int, CD_PROP_INT, vdata, totvert, MeshVertexIntPropertyLayer) + vertex, int, CD_PROP_INT32, vdata, totvert, MeshVertexIntPropertyLayer) DEFINE_CUSTOMDATA_PROPERTY_API( - vertex, string, CD_PROP_STR, vdata, totvert, MeshVertexStringPropertyLayer) + vertex, string, CD_PROP_STRING, vdata, totvert, MeshVertexStringPropertyLayer) DEFINE_CUSTOMDATA_PROPERTY_API( - polygon, float, CD_PROP_FLT, pdata, totpoly, MeshPolygonFloatPropertyLayer) + polygon, float, CD_PROP_FLOAT, pdata, totpoly, MeshPolygonFloatPropertyLayer) DEFINE_CUSTOMDATA_PROPERTY_API( - polygon, int, CD_PROP_INT, pdata, totpoly, MeshPolygonIntPropertyLayer) + polygon, int, CD_PROP_INT32, pdata, totpoly, MeshPolygonIntPropertyLayer) DEFINE_CUSTOMDATA_PROPERTY_API( - polygon, string, CD_PROP_STR, pdata, totpoly, MeshPolygonStringPropertyLayer) + polygon, string, CD_PROP_STRING, pdata, totpoly, MeshPolygonStringPropertyLayer) # undef DEFINE_CUSTOMDATA_PROPERTY_API static PointerRNA rna_Mesh_uv_layers_new(struct Mesh *me, const char *name, const bool do_init) diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index dc1b7ba8a75..1ed892f5464 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -649,7 +649,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * .mpoly = mpoly, .polynors = polynors, .poly_strength = CustomData_get_layer_named( - &result->pdata, CD_PROP_INT, MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID), + &result->pdata, CD_PROP_INT32, MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID), .dvert = dvert, .defgrp_index = defgrp_index, @@ -702,7 +702,7 @@ static void requiredDataMask(Object *UNUSED(ob), } if (wnmd->flag & MOD_WEIGHTEDNORMAL_FACE_INFLUENCE) { - r_cddata_masks->pmask |= CD_MASK_PROP_INT; + r_cddata_masks->pmask |= CD_MASK_PROP_INT32; } } diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index ffddfb4a7e1..652b6ecf894 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -184,17 +184,17 @@ static PyGetSetDef bpy_bmlayeraccess_vert_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"shape", (getter)bpy_bmlayeraccess_collection_get, @@ -225,17 +225,17 @@ static PyGetSetDef bpy_bmlayeraccess_edge_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"bevel_weight", (getter)bpy_bmlayeraccess_collection_get, @@ -263,17 +263,17 @@ static PyGetSetDef bpy_bmlayeraccess_face_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"face_map", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, @@ -296,17 +296,17 @@ static PyGetSetDef bpy_bmlayeraccess_loop_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"uv", (getter)bpy_bmlayeraccess_collection_get, @@ -1071,17 +1071,17 @@ PyObject *BPy_BMLayerItem_GetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer) ret = BPy_BMDeformVert_CreatePyObject(value); break; } - case CD_PROP_FLT: + case CD_PROP_FLOAT: case CD_PAINT_MASK: { ret = PyFloat_FromDouble(*(float *)value); break; } - case CD_PROP_INT: + case CD_PROP_INT32: case CD_FACEMAP: { ret = PyLong_FromLong(*(int *)value); break; } - case CD_PROP_STR: { + case CD_PROP_STRING: { MStringProperty *mstring = value; ret = PyBytes_FromStringAndSize(mstring->s, mstring->s_len); break; @@ -1134,7 +1134,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj ret = BPy_BMDeformVert_AssignPyObject(value, py_value); break; } - case CD_PROP_FLT: + case CD_PROP_FLOAT: case CD_PAINT_MASK: { float tmp_val = PyFloat_AsDouble(py_value); if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) { @@ -1147,7 +1147,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj } break; } - case CD_PROP_INT: + case CD_PROP_INT32: case CD_FACEMAP: { int tmp_val = PyC_Long_AsI32(py_value); if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) { @@ -1159,7 +1159,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj } break; } - case CD_PROP_STR: { + case CD_PROP_STRING: { MStringProperty *mstring = value; char *tmp_val; Py_ssize_t tmp_val_len; -- cgit v1.2.3