[Bf-blender-cvs] [3f977d18f09] topbar: Merge branch 'blender2.8' into topbar

Brecht Van Lommel noreply at git.blender.org
Thu Apr 19 19:41:24 CEST 2018


Commit: 3f977d18f09fdf6697456ac101d94da0e683db43
Author: Brecht Van Lommel
Date:   Thu Apr 19 19:39:19 2018 +0200
Branches: topbar
https://developer.blender.org/rB3f977d18f09fdf6697456ac101d94da0e683db43

Merge branch 'blender2.8' into topbar

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 791d53f25ee,0d781322d4f..fe5a03b1632
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -950,55 -928,22 +940,74 @@@ void blo_do_versions_280(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 280, 8)) {
+ 		/* Blender Internal removal */
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			if (STREQ(scene->r.engine, "BLENDER_RENDER") ||
+ 			    STREQ(scene->r.engine, "BLENDER_GAME")) {
+ 				BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
+ 			}
+ 
+ 			scene->r.bake_mode = 0;
+ 		}
+ 
+ 		for (Tex *tex = main->tex.first; tex; tex = tex->id.next) {
+ 			/* Removed envmap, pointdensity, voxeldata, ocean textures. */
+ 			if (ELEM(tex->type, 10, 14, 15, 16)) {
+ 				tex->type = 0;
+ 			}
+ 		}
+ 	}
++
 +	if (!DNA_struct_find(fd->filesdna, "SpaceTopBar")) {
 +#ifdef WITH_REDO_REGION_REMOVAL
 +		for (bScreen *screen = main->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 (ELEM(sl->spacetype, SPACE_VIEW3D, SPACE_CLIP)) {
 +						ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +
 +						for (ARegion *region = regionbase->first, *region_next; region; region = region_next) {
 +							region_next = region->next;
 +
 +							if (region->regiontype == RGN_TYPE_TOOL_PROPS) {
 +								BKE_area_region_free(NULL, region);
 +								BLI_freelinkN(regionbase, region);
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
 +#endif
 +
 +		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 +			int win_width = 0, win_height = 0;
 +			/* Calculate window width/height from screen vertices */
 +			for (ScrVert *vert = screen->vertbase.first; vert; vert = vert->next) {
 +				win_width  = MAX2(win_width, vert->vec.x);
 +				win_height = MAX2(win_height, vert->vec.y);
 +			}
 +
 +			for (ScrArea *area = screen->areabase.first, *area_next; area; area = area_next) {
 +				area_next = area->next;
 +
 +				if (area->spacetype == SPACE_INFO) {
 +					if ((area->v2->vec.y == win_height) && (area->v1->vec.x == 0) && (area->v4->vec.x == win_width)) {
 +						BKE_screen_area_free(area);
 +
 +						BLI_remlink(&screen->areabase, area);
 +
 +						BKE_screen_remove_double_scredges(screen);
 +						BKE_screen_remove_unused_scredges(screen);
 +						BKE_screen_remove_unused_scrverts(screen);
 +
 +						MEM_freeN(area);
 +					}
 +				}
 +				/* AREA_TEMP_INFO is deprecated from now on, it should only be set for info areas
 +				 * which are deleted above, so don't need to unset it. Its slot/bit can be reused */
 +			}
 +		}
 +	}
  }



More information about the Bf-blender-cvs mailing list