From 0d4dd0df6cfc0e97082faba78d7f05e3e24119d7 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Wed, 11 Feb 2015 17:06:39 +0100 Subject: Code cleanup: use BPXRect in Ptex layout interface --- intern/cycles/render/image.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 144a83714f3..4cd2124aa0d 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -406,12 +406,12 @@ static BPXImageBuf *ptex_pack_uchar_cb(const struct BPXPackedLayout *layout, width, height, num_regions*4); for (int i = 0; i < num_regions; i++) { - int x, y, w, h; - if (BPX_packed_layout_item(layout, i, &x, &y, &w, &h)) { - regions[i][0] = x; - regions[i][1] = y; - regions[i][2] = w; - regions[i][3] = h; + BPXRect rect; + if (BPX_packed_layout_item(layout, i, &rect)) { + regions[i][0] = rect.xbegin; + regions[i][1] = rect.ybegin; + regions[i][2] = rect.xend - rect.xbegin; + regions[i][3] = rect.yend - rect.ybegin; } else { // TODO -- cgit v1.2.3