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 --- tests/gtests/bmesh/bmesh_core_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/gtests/bmesh/bmesh_core_test.cc') diff --git a/tests/gtests/bmesh/bmesh_core_test.cc b/tests/gtests/bmesh/bmesh_core_test.cc index 25c48e9fd36..afbc11e0722 100644 --- a/tests/gtests/bmesh/bmesh_core_test.cc +++ b/tests/gtests/bmesh/bmesh_core_test.cc @@ -15,7 +15,7 @@ TEST(bmesh_core, BMVertCreate) bm = BM_mesh_create(&bm_mesh_allocsize_default, &bm_params); EXPECT_EQ(bm->totvert, 0); /* make a custom layer so we can see if it is copied properly */ - BM_data_layer_add(bm, &bm->vdata, CD_PROP_FLT); + BM_data_layer_add(bm, &bm->vdata, CD_PROP_FLOAT); bv1 = BM_vert_create(bm, co1, NULL, BM_CREATE_NOP); ASSERT_TRUE(bv1 != NULL); EXPECT_EQ(bv1->co[0], 1.0f); @@ -30,11 +30,11 @@ TEST(bmesh_core, BMVertCreate) EXPECT_TRUE(is_zero_v3(bv2->co)); /* create with example should copy custom data but not select flag */ BM_vert_select_set(bm, bv2, true); - BM_elem_float_data_set(&bm->vdata, bv2, CD_PROP_FLT, 1.5f); + BM_elem_float_data_set(&bm->vdata, bv2, CD_PROP_FLOAT, 1.5f); bv3 = BM_vert_create(bm, co1, bv2, BM_CREATE_NOP); ASSERT_TRUE(bv3 != NULL); EXPECT_FALSE(BM_elem_flag_test((BMElem *)bv3, BM_ELEM_SELECT)); - EXPECT_EQ(BM_elem_float_data_get(&bm->vdata, bv3, CD_PROP_FLT), 1.5f); + EXPECT_EQ(BM_elem_float_data_get(&bm->vdata, bv3, CD_PROP_FLOAT), 1.5f); EXPECT_EQ(BM_mesh_elem_count(bm, BM_VERT), 3); BM_mesh_free(bm); } -- cgit v1.2.3