diff options
author | Jeroen Bakker <jbakker> | 2020-05-19 16:20:09 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-05-19 16:20:40 +0300 |
commit | 9ac4e4a1c71e163340871d24e40d7f89f4f2b539 (patch) | |
tree | d4d815eccbb8448db9399fa5be7f125bb70242aa | |
parent | a6646fb0d02395d100cbaaa8aef7171108e4d2f2 (diff) |
Fix T76375: UDIM Rectangular Tiled Image EEVEE freezes Blender
When packing the image the height of the tile was checked to the width
of the packing area. This resulted that the tile was ignored.
Reviewed By: Clément Foucault
Differential Revision: https://developer.blender.org/D7784
m--------- | release/datafiles/locale | 0 | ||||
m--------- | release/scripts/addons | 0 | ||||
-rw-r--r-- | source/blender/blenlib/intern/boxpack_2d.c | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 1d9b8b2ffa67a8832073acf316150b2dfaa2db0 +Subproject 0fd21a7cc382066d184fda8153f925bb825af2c diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 47a32a5370d36942674621e5a03e57e8dd4986d +Subproject 9a9832d5d7fe61a446516f2e2722f8356bd7e70 diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index 6ecadeecec5..83866f766df 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -705,7 +705,7 @@ void BLI_box_pack_2d_fixedarea(ListBase *boxes, int width, int height, ListBase LISTBASE_FOREACH_MUTABLE (FixedSizeBoxPack *, box, boxes) { LISTBASE_FOREACH (FixedSizeBoxPack *, space, &spaces) { /* Skip this space if it's too small. */ - if (box->w > space->w || box->h > space->w) { + if (box->w > space->w || box->h > space->h) { continue; } |