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/bmesh | |
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/bmesh')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 11 |
1 files changed, 6 insertions, 5 deletions
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); |