diff options
author | Jacques Lucke <jacques@blender.org> | 2020-06-10 16:47:31 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-06-10 16:47:31 +0300 |
commit | a58dc25b077bfacf88bcdb8077633f30a049b96a (patch) | |
tree | 1ecce5d35c834855f56d25c89796e8e16a9431ae /source/blender/editors/mesh | |
parent | cc26041d36c53c19874318adb71589748e62ccaa (diff) |
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
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 10 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 10 |
2 files changed, 10 insertions, 10 deletions
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; } |