diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-06 07:42:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-06 07:43:47 +0300 |
| commit | 1f22ef34bbb13e17dd5e4f4c573bdcccc146fb3a (patch) | |
| tree | 46242e35b1f990c7ab3e12bb72bc6911892ae939 | |
| parent | 31026f8c0e17b04f823b0fae808065b66841af6d (diff) | |
| parent | f5daa58242a1b42fea7a15039968499318978842 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_ruler.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index ade575a52d6..8a00b88af12 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -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) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index 1fe9a2b1632..d7a605eca5e 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -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)); diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 904fddf9bf6..b31faa73c63 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -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)); |