[Bf-blender-cvs] [e704c78d879] temp-udim-images: Merge remote-tracking branch 'origin/blender2.8' into udim

Lukas Stockner noreply at git.blender.org
Fri Jul 27 21:43:35 CEST 2018


Commit: e704c78d8799172aa0f5a9122c0ff72642db0203
Author: Lukas Stockner
Date:   Fri Jul 27 21:42:50 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rBe704c78d8799172aa0f5a9122c0ff72642db0203

Merge remote-tracking branch 'origin/blender2.8' into udim

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 487e0e8b9ec,39ceb527209..d10e9ff294a
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -1622,27 -1640,6 +1641,28 @@@ void blo_do_versions_280(FileData *fd, 
  				BKE_screen_view3d_shading_init(&scene->display.shading);
  			}
  		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "Image", "short", "num_tiles")) {
 +			for (Image *ima = bmain->image.first; ima; ima = ima->id.next) {
 +				ImageTile *tile = MEM_callocN(sizeof(ImageTile), "Image Tiles");
 +				tile->ok = 1;
 +				BLI_addtail(&ima->tiles, tile);
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceImage", "int", "tile_grid_shape[2]")) {
 +			for (bScreen *screen = bmain->screen.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;
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
+ 
  }



More information about the Bf-blender-cvs mailing list