[Bf-blender-cvs] [b5abbc40a07] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: b5abbc40a07041af91dca5d0a4acd8e5f1518c91
Author: YimingWu
Date:   Fri Dec 13 13:42:27 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBb5abbc40a07041af91dca5d0a4acd8e5f1518c91

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 8de01e6334e,03582990703..dc8e5e9f97e
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4295,5 -4292,30 +4305,30 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
+ 
+     /* Add primary tile to images. */
+     if (!DNA_struct_elem_find(fd->filesdna, "Image", "ListBase", "tiles")) {
+       for (Image *ima = bmain->images.first; ima; ima = ima->id.next) {
+         ImageTile *tile = MEM_callocN(sizeof(ImageTile), "Image Tile");
+         tile->ok = 1;
+         tile->tile_number = 1001;
+         BLI_addtail(&ima->tiles, tile);
+       }
+     }
+ 
+     /* UDIM Image Editor change. */
+     if (!DNA_struct_elem_find(fd->filesdna, "SpaceImage", "int", "tile_grid_shape[2]")) {
+       for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+         for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+           for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+             if (sl->spacetype == SPACE_IMAGE) {
+               SpaceImage *sima = (SpaceImage *)sl;
+               sima->tile_grid_shape[0] = 1;
+               sima->tile_grid_shape[1] = 1;
+             }
+           }
+         }
+       }
+     }
    }
 -}
 +}