Commit: 8697062438e0bac175d094d9142926d93da59923 Author: YimingWu Date: Fri Jul 5 20:49:49 2019 +0800 Branches: soc-2019-npr https://developer.blender.org/rB8697062438e0bac175d094d9142926d93da59923
LANPR: Fix MSVC errors. =================================================================== M source/blender/draw/engines/lanpr/lanpr_chain.c M source/blender/draw/engines/lanpr/lanpr_ops.c =================================================================== diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c index 868958a1719..b78baf75616 100644 --- a/source/blender/draw/engines/lanpr/lanpr_chain.c +++ b/source/blender/draw/engines/lanpr/lanpr_chain.c @@ -441,9 +441,7 @@ LANPR_BoundingArea *lanpr_get_rlci_bounding_area_recursive(LANPR_RenderBuffer *r else { LANPR_BoundingArea *ch = root->child; #define IN_BOUND(ba, rlci) \ - \ - ba.l <= rlci->pos[0] && \ - ba.r >= rlci->pos[0] && ba.b <= rlci->pos[1] && ba.u >= rlci->pos[1] + ba.l <= rlci->pos[0] && ba.r >= rlci->pos[0] && ba.b <= rlci->pos[1] && ba.u >= rlci->pos[1] if (IN_BOUND(ch[0], rlci)) { return lanpr_get_rlci_bounding_area_recursive(rb, &ch[0], rlci); diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index 1a53f1a1b85..e6ed645f142 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -450,16 +450,20 @@ void lanpr_link_line_with_bounding_area(LANPR_RenderBuffer *rb, list_append_pointer_static_pool(&rb->render_data_pool, &RootBoundingArea->linked_lines, rl); } else { - if (lanpr_line_crosses_bounding_area(rb, rl->l, rl->r, &RootBoundingArea->child[0])) { + if (lanpr_line_crosses_bounding_area( + rb, rl->l->fbcoord, rl->r->fbcoord, &RootBoundingArea->child[0])) { lanpr_link_line_with_bounding_area(rb, &RootBoundingArea->child[0], rl); } - else if (lanpr_line_crosses_bounding_area(rb, rl->l, rl->r, &RootBoundingArea->child[1])) { + else if (lanpr_line_crosses_bounding_area( + rb, rl->l->fbcoord, rl->r->fbcoord, &RootBoundingArea->child[1])) { lanpr_link_line_with_bounding_area(rb, &RootBoundingArea->child[1], rl); } - else if (lanpr_line_crosses_bounding_area(rb, rl->l, rl->r, &RootBoundingArea->child[2])) { + else if (lanpr_line_crosses_bounding_area( + rb, rl->l->fbcoord, rl->r->fbcoord, &RootBoundingArea->child[2])) { lanpr_link_line_with_bounding_area(rb, &RootBoundingArea->child[2], rl); } - else if (lanpr_line_crosses_bounding_area(rb, rl->l, rl->r, &RootBoundingArea->child[3])) { + else if (lanpr_line_crosses_bounding_area( + rb, rl->l->fbcoord, rl->r->fbcoord, &RootBoundingArea->child[3])) { lanpr_link_line_with_bounding_area(rb, &RootBoundingArea->child[3], rl); } } @@ -591,10 +595,7 @@ static LANPR_BoundingArea *lanpr_get_point_bounding_area_recursive(LANPR_Boundin else { LANPR_BoundingArea *ch = ba->child; #define IN_BOUND(i, x, y) \ - \ - ba->child[i] \ - .l <= x && \ - ba->child[i].r >= x && ba->child[i].b <= y && ba->child[i].u >= y + ba->child[i].l <= x && ba->child[i].r >= x && ba->child[i].b <= y && ba->child[i].u >= y if (IN_BOUND(0, x, y)) { return lanpr_get_point_bounding_area_recursive(&ba->child[0], x, y); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs