[Bf-blender-cvs] [367b6f1] HMD_viewport: Merge branch 'master' into HMD_viewport

[Julian Eisel]

Commit: 367b6f16462b0722f98ab26330355e33c6e1b31f
Author: Julian Eisel
Date:   Sat Mar 26 01:16:44 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB367b6f16462b0722f98ab26330355e33c6e1b31f

Merge branch 'master' into HMD_viewport

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 1e820fe,049a8b65..f764d70
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1067,13 -1067,28 +1067,36 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		/* Bug: Was possible to add preview region to sequencer view by using AZones.
+ 		 * Caused by redundant preview region stored into startup.blend */
+ 		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 (sl->spacetype == SPACE_SEQ) {
+ 						SpaceSeq *sseq = (SpaceSeq *)sl;
+ 						if (sseq->view == SEQ_VIEW_SEQUENCE) {
+ 							ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+ 							for (ARegion *ar = lb->first; ar; ar = ar->next) {
+ 								/* remove preview region for sequencer-only view! */
+ 								if (ar->regiontype == RGN_TYPE_PREVIEW) {
+ 									BKE_area_region_free(NULL, ar);
+ 									BLI_freelinkN(&sl->regionbase, ar);
+ 									break;
+ 								}
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
  	}
 +
 +	{
 +		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
 +			if (scene->r.hmd_view_shade == 0) {
 +				scene->r.hmd_view_shade = OB_MATERIAL;
 +			}
 +		}
 +	}
  }
diff --cc source/blender/gpu/intern/gpu_shader.c
index 3870f15,49f2440..9b78d04
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -677,13 -690,12 +692,16 @@@ GPUShader *GPU_shader_get_builtin_fx_sh
  				break;
  
  			case GPU_SHADER_FX_DEPTH_RESOLVE:
- 				GG.shaders.fx_shaders[offset] = GPU_shader_create(datatoc_gpu_shader_fx_vert_glsl, datatoc_gpu_shader_fx_depth_resolve_glsl, NULL, NULL, defines, 0, 0, 0);
+ 				shader = GPU_shader_create(datatoc_gpu_shader_fx_vert_glsl, datatoc_gpu_shader_fx_depth_resolve_glsl, NULL, NULL, defines, 0, 0, 0);
  				break;
 +
 +			case GPU_SHADER_FX_LENS_DISTORTION:
 +				GG.shaders.fx_shaders[offset] = GPU_shader_create(datatoc_gpu_shader_fx_lensdistortion_vert_glsl, datatoc_gpu_shader_fx_lensdistortion_frag_glsl, NULL, NULL, defines, 0, 0, 0);
 +				break;
  		}
+ 
+ 		GG.shaders.fx_shaders[offset] = shader;
+ 		GPU_fx_shader_init_interface(shader, effect);
  	}
  
  	return GG.shaders.fx_shaders[offset];