[Bf-blender-cvs] [e2f42ff9073] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: e2f42ff907313c56f57486ba923c9eb957520550
Author: Brecht Van Lommel
Date:   Wed Sep 6 17:23:47 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBe2f42ff907313c56f57486ba923c9eb957520550

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index cabb1409603,f87d04fa0a3..9f17b8d3c5c
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1670,28 -1670,18 +1670,39 @@@ void blo_do_versions_270(FileData *fd, 
  		for (Mesh *me = main->mesh.first; me; me = me->id.next) {
  			CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, "");
  		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
 +			bScreen *screen;
 +
 +			for (screen = main->screen.first; screen; screen = screen->id.next) {
 +				ScrArea *sa;
 +				for (sa = screen->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						switch (sl->spacetype) {
 +							case SPACE_VIEW3D:
 +							{
 +								View3D *v3d = (View3D *)sl;
 +								v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
+ 
+ 	{
+ 		/* Fix for invalid state of screen due to bug in older versions. */
+ 		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
+ 			for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
+ 				if(sa->full && sc->state == SCREENNORMAL) {
+ 					sa->full = NULL;
+ 				}
+ 			}
+ 		}
+ 	}
  }
  
  void do_versions_after_linking_270(Main *main)
diff --cc source/blender/editors/screen/screen_edit.c
index 56fe11a5006,71b00a0a7c6..fca2def644c
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@@ -1470,12 -1893,9 +1470,10 @@@ ScrArea *ED_screen_state_toggle(bContex
  	}
  
  	if (sa && sa->full) {
 +		WorkSpaceLayout *layout_old = WM_window_get_active_layout(win);
  		/* restoring back to SCREENNORMAL */
- 		ScrArea *old;
- 
  		sc = sa->full;       /* the old screen to restore */
 -		oldscreen = win->screen; /* the one disappearing */
 +		oldscreen = WM_window_get_active_screen(win); /* the one disappearing */
  
  		sc->state = SCREENNORMAL;
  
diff --cc source/blender/gpu/shaders/gpu_shader_material.glsl
index b060031c27f,3dbecc58a7e..3a47aea405e
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@@ -3446,13 -3181,25 +3448,25 @@@ void node_tex_image_box(vec3 texco
  	}
  	color = vec4(0);
  	if (weight.x > 0.0) {
- 		color += weight.x * texture(ima, texco.yz);
+ 		vec2 uv = texco.yz;
+ 		if(signed_N.x < 0.0) {
+ 			uv.x = 1.0 - uv.x;
+ 		}
 -		color += weight.x * texture2D(ima, uv);
++		color += weight.x * texture(ima, uv);
  	}
  	if (weight.y > 0.0) {
- 		color += weight.y * texture(ima, texco.xz);
+ 		vec2 uv = texco.xz;
+ 		if(signed_N.y > 0.0) {
+ 			uv.x = 1.0 - uv.x;
+ 		}
 -		color += weight.y * texture2D(ima, uv);
++		color += weight.y * texture(ima, uv);
  	}
  	if (weight.z > 0.0) {
- 		color += weight.z * texture(ima, texco.yx);
+ 		vec2 uv = texco.yx;
+ 		if(signed_N.z > 0.0) {
+ 			uv.x = 1.0 - uv.x;
+ 		}
 -		color += weight.z * texture2D(ima, uv);
++		color += weight.z * texture(ima, uv);
  	}
  
  	alpha = color.a;