sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix [#31535] Radian Unit System Button Ignored for Face Angles display.

Browse Source 
Also avoid multiplying each vertex three times with obmat...
This commit is contained in:
Bastien Montagne 2012-05-19 20:16:29 +00:00
parent ed679693c9
commit 436b63eea5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/space_view3d/drawobject.c
View File

@ -2951,6 +2951,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
if (me->drawflag & ME_DRAWEXTRA_FACEANG) { if (me->drawflag & ME_DRAWEXTRA_FACEANG) {
BMFace *efa; BMFace *efa;
int is_rad = unit->system_rotation == USER_UNIT_ROT_RADIANS;
UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col); UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
@ -2961,37 +2962,41 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
if (is_face_sel || do_moving) { if (is_face_sel || do_moving) {
BMIter liter; BMIter liter;
BMLoop *loop; BMLoop *loop;
int cent_ok = FALSE; int is_first = TRUE;
BM_ITER_ELEM(loop, &liter, efa, BM_LOOPS_OF_FACE) { BM_ITER_ELEM(loop, &liter, efa, BM_LOOPS_OF_FACE) {
if (is_face_sel || (do_moving && BM_elem_flag_test(loop->v, BM_ELEM_SELECT))) { if (is_face_sel || (do_moving && BM_elem_flag_test(loop->v, BM_ELEM_SELECT))) {
/* yes, we should avoid triple matrix multiply every vertex for 'global' */
float angle; float angle;
/* lazy init center calc */ /* lazy init center calc */
if (cent_ok == FALSE) { if (is_first) {
BM_face_calc_center_bounds(efa, vmid); BM_face_calc_center_bounds(efa, vmid);
cent_ok = TRUE; /* Avoid triple matrix multiply every vertex for 'global' */
if (do_global) {
copy_v3_v3(v1, loop->prev->v->co);
copy_v3_v3(v2, loop->v->co);
mul_mat3_m4_v3(ob->obmat, v1);
mul_mat3_m4_v3(ob->obmat, v2);
}
is_first = FALSE;
} }
if (do_global) { if (do_global) {
copy_v3_v3(v1, loop->prev->v->co);
copy_v3_v3(v2, loop->v->co);
copy_v3_v3(v3, loop->next->v->co); copy_v3_v3(v3, loop->next->v->co);
mul_mat3_m4_v3(ob->obmat, v1);
mul_mat3_m4_v3(ob->obmat, v2);
mul_mat3_m4_v3(ob->obmat, v3); mul_mat3_m4_v3(ob->obmat, v3);
angle = angle_v3v3v3(v1, v2, v3); angle = angle_v3v3v3(v1, v2, v3);
interp_v3_v3v3(fvec, vmid, v2, 0.8f); interp_v3_v3v3(fvec, vmid, v2, 0.8f);
copy_v3_v3(v1, v2);
copy_v3_v3(v2, v3);
} }
else { else {
angle = angle_v3v3v3(loop->prev->v->co, loop->v->co, loop->next->v->co); angle = angle_v3v3v3(loop->prev->v->co, loop->v->co, loop->next->v->co);
interp_v3_v3v3(fvec, vmid, loop->v->co, 0.8f); interp_v3_v3v3(fvec, vmid, loop->v->co, 0.8f);
} }
BLI_snprintf(numstr, sizeof(numstr), "%.3f", RAD2DEGF(angle)); BLI_snprintf(numstr, sizeof(numstr), "%.3f", is_rad ? angle : RAD2DEGF(angle));
view3d_cached_text_draw_add(fvec, numstr, 0, txt_flag, col); view3d_cached_text_draw_add(fvec, numstr, 0, txt_flag, col);
} }
} }