From feb3c74a05f114556fe2339cf96912c7bf7b60f0 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Thu, 6 Sep 2018 00:23:50 -0400 Subject: [PATCH 1/2] Cycles: Allow cancel during displacement of meshes --- intern/cycles/render/mesh.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 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) { From f5daa58242a1b42fea7a15039968499318978842 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Sep 2018 14:41:36 +1000 Subject: [PATCH 2/2] Fix ruler angle arc displaying past endpoints --- source/blender/editors/space_view3d/view3d_ruler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 012f71c10ba..f51b47032aa 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -485,7 +485,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));