svn merge ^/trunk/blender -r42221:42245

1 files changed, 14 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 57cd3ab8537..aa44eca0605 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12690,6 +12690,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	{
 		Scene *sce;
 		MovieClip *clip;
+		bScreen *sc;
 
 		for(sce = main->scene.first; sce; sce = sce->id.next) {
 			if (sce->r.im_format.depth == 0) {
@@ -12708,6 +12709,19 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				settings->default_search_size= 51;
 			}
 		}
+
+		for (sc= main->screen.first; sc; sc= sc->id.next) {
+			ScrArea *sa;
+			for (sa= sc->areabase.first; sa; sa= sa->next) {
+				SpaceLink *sl;
+				for (sl= sa->spacedata.first; sl; sl= sl->next) {
+					if(sl->spacetype==SPACE_VIEW3D) {
+						View3D *v3d= (View3D *)sl;
+						v3d->flag2&= ~V3D_RENDER_SHADOW;
+					}
+				}
+			}
+		}
 	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */