[Bf-blender-cvs] [9ac4e4a1c71] blender-v2.83-release: Fix T76375: UDIM Rectangular Tiled Image EEVEE freezes Blender

Jeroen Bakker noreply at git.blender.org
Tue May 19 15:21:29 CEST 2020


Commit: 9ac4e4a1c71e163340871d24e40d7f89f4f2b539
Author: Jeroen Bakker
Date:   Tue May 19 15:20:09 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB9ac4e4a1c71e163340871d24e40d7f89f4f2b539

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
M	release/scripts/addons
M	source/blender/blenlib/intern/boxpack_2d.c

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 1d9b8b2ffa6..0fd21a7cc38 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 1d9b8b2ffa67a8832073acf316150b2dfaa2db02
+Subproject commit 0fd21a7cc382066d184fda8153f925bb825af2c6
diff --git a/release/scripts/addons b/release/scripts/addons
index 47a32a5370d..9a9832d5d7f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 47a32a5370d36942674621e5a03e57e8dd4986d8
+Subproject commit 9a9832d5d7fe61a446516f2e2722f8356bd7e709
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;
       }



More information about the Bf-blender-cvs mailing list