griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-09-06 14:42:59 +10:00
parent 31026f8c0e f5daa58242
commit 1f22ef34bb
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/mesh.cpp
View File

@@ -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) {

2
source/blender/editors/space_view3d/view3d_gizmo_ruler.c
View File

@@ -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));

2
source/blender/editors/space_view3d/view3d_ruler.c
View File

@@ -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));