Merge branch 'master' into blender2.8
This commit is contained in:
commit
1f22ef34bb
|
@ -2162,10 +2162,9 @@ void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scen
|
|||
num_bvh++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO: properly handle cancel halfway displacement */
|
||||
if(progress.get_cancel()) return;
|
||||
if(progress.get_cancel()) return;
|
||||
}
|
||||
|
||||
/* Device re-update after displacement. */
|
||||
if(displacement_done) {
|
||||
|
|
|
@ -577,7 +577,7 @@ static void gizmo_ruler_draw(const bContext *C, wmGizmo *gz)
|
|||
float quat[4];
|
||||
float axis[3];
|
||||
float angle;
|
||||
const float px_scale = (ED_view3d_pixel_size(rv3d, ruler_item->co[1]) *
|
||||
const float px_scale = (ED_view3d_pixel_size_no_ui_scale(rv3d, ruler_item->co[1]) *
|
||||
min_fff(arc_size,
|
||||
len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
|
||||
len_v2v2(co_ss[2], co_ss[1]) / 2.0f));
|
||||
|
|
|
@ -491,7 +491,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
|
|||
float quat[4];
|
||||
float axis[3];
|
||||
float angle;
|
||||
const float px_scale = (ED_view3d_pixel_size(rv3d, ruler_item->co[1]) *
|
||||
const float px_scale = (ED_view3d_pixel_size_no_ui_scale(rv3d, ruler_item->co[1]) *
|
||||
min_fff(arc_size,
|
||||
len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
|
||||
len_v2v2(co_ss[2], co_ss[1]) / 2.0f));
|
||||
|
|
Loading…
Reference in New Issue