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

[Julian Eisel]

Commit: d9428f7a037bd2e34782a6f56783d060b14dee7d
Author: Julian Eisel
Date:   Sat Nov 19 21:09:48 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBd9428f7a037bd2e34782a6f56783d060b14dee7d

Merge branch 'master' into HMD_viewport

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 9b97f5a,25d78b7..1908004
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1467,13 -1467,10 +1467,20 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 278, 4)) {
+ 		const float sqrt_3 = (float)M_SQRT3;
+ 		for (Brush *br = main->brush.first; br; br = br->id.next) {
+ 			br->fill_threshold /= sqrt_3;
+ 		}
+ 	}
++
 +	{
 +#ifdef WITH_INPUT_HMD
 +		if (!DNA_struct_elem_find(fd->filesdna, "wmWindowManager", "HMDViewInfo", "hmd_view")) {
 +			for (wmWindowManager *wm = main->wm.first; wm; wm = wm->id.next) {
 +				wm->hmd_view.view_shade = OB_MATERIAL;
 +			}
 +		}
 +#endif
 +	}
  }