diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 22:49:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 22:49:56 +0400 |
| commit | 5b2ea6f8a4c2414042ce7d96be5d42b54c9a8459 (patch) | |
| tree | f3f69734b6cdc36e13b7b82bc0585adcf3ec733c /source/blender/editors/space_view3d/view3d_buttons.c | |
| parent | 37ff2a291f38548e1ac9d5d31939ecda0bea65ed (diff) | |
remove bm_get_cd_float, use CustomData_bmesh_get instead, this function only casts to a float, and doesnt simplify args.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_buttons.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 045bbdcd012..44bc96cdb89 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -173,10 +173,10 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float float *f; totedge++; - f = bm_get_cd_float(&bm->edata, eed->head.data, CD_CREASE); + f = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE); median[3]+= f ? *f : 0.0f; - f = bm_get_cd_float(&bm->edata, eed->head.data, CD_BWEIGHT); + f = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT); median[6]+= f ? *f : 0.0f; } } @@ -436,7 +436,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { - float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE); + float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; *crease= fixed_crease; @@ -458,7 +458,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { - float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE); + float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; @@ -473,7 +473,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { - float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE); + float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; *crease = 1.0f - ((1.0f - *crease) * sca); @@ -493,7 +493,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { - float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT); + float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); if(!bweight) break; *bweight = fixed_bweight; @@ -515,7 +515,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { - float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT); + float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); if(!bweight) break; *bweight *= sca; @@ -529,7 +529,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { - float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT); + float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); if(!bweight) break; *bweight = 1.0f - ((1.0f - *bweight) * sca); |