diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 18:03:20 +0300 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 18:05:12 +0300 |
commit | ca9d86b2ea8dfb6fbae28f6b6982aeed1bb0caae (patch) | |
tree | 2e6a32270844bf84564fbc085c44ed1d40f5f8cb /intern/cycles | |
parent | a9994506cfee819230fa2942d88286f7bc649901 (diff) |
Naming cleanup: better consistency in extern/ptex
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/image.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 25ed364d55e..2651c8656f3 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -391,12 +391,12 @@ struct PtexPackUcharContext { int slot; }; -static BPXImageBuf *ptex_pack_uchar_cb(const struct PtexPackedLayout *layout, +static BPXImageBuf *ptex_pack_uchar_cb(const struct BPXPackedLayout *layout, void *c) { PtexPackUcharContext &context = *static_cast<PtexPackUcharContext*>(c); - const int width = ptex_packed_layout_width(layout); - const int height = ptex_packed_layout_height(layout); + const int width = BPX_packed_layout_width(layout); + const int height = BPX_packed_layout_height(layout); const int depth = 1; (*context.pixels) = (uchar*)context.tex_img.resize(width, height, depth); @@ -407,7 +407,7 @@ static BPXImageBuf *ptex_pack_uchar_cb(const struct PtexPackedLayout *layout, for (int i = 0; i < num_regions; i++) { int x, y, w, h; - if (ptex_packed_layout_item(layout, i, &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; |