diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-19 16:24:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-19 16:24:45 +0300 |
| commit | a95afed6def1abd14676afae911501f482bd68d9 (patch) | |
| tree | ab6845a27025c39751a03bbcac0122f7ad0f6531 /source/blender/blenlib | |
| parent | cc485191e4c1fc344efc1f0bb17d17e6ff08a8fc (diff) | |
| parent | 9ccc73ade8a25db5bb6bf17ee870870c2826efa9 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/boxpack_2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |