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

[Julian Eisel]

Commit: ccf5de8a719999a20b4d427d401b42da94f842b4
Author: Julian Eisel
Date:   Tue Nov 15 16:18:56 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBccf5de8a719999a20b4d427d401b42da94f842b4

Merge branch 'master' into HMD_viewport

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/interface/resources.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 173ebec,8133d04..147efe0
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1455,12 -1455,15 +1455,25 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		/* constant detail for sculpting is now a resolution value instead of
+ 		 * a percentage, we reuse old DNA struct member but convert it */
+ 		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ 			if (scene->toolsettings != NULL) {
+ 				ToolSettings *ts = scene->toolsettings;
+ 				if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) {
+ 					ts->sculpt->constant_detail = 100.0f / ts->sculpt->constant_detail;
+ 				}
+ 			}
+ 		}
+ 	}
++
++	{
 +#ifdef WITH_INPUT_HMD
 +		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "HMDViewSettings", "hmd_settings")) {
 +			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
 +				BKE_scene_hmd_settings_default_init(scene);
 +			}
 +		}
 +#endif
 +	}
  }
diff --cc source/blender/editors/interface/resources.c
index ed0a4ee,5392840..c21bba9
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2762,11 -2764,7 +2764,9 @@@ void init_userdef_do_versions(void
  	 * (keep this block even if it becomes empty).
  	 */
  	{
- 		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
- 			/* Keyframe Indicators (were using wrong alpha) */
- 			btheme->tv3d.time_keyframe[3] = btheme->tv3d.time_gp_keyframe[3] = 255;
- 			btheme->ttime.time_keyframe[3] = btheme->ttime.time_gp_keyframe[3] = 255;
- 		}
 -		
++		U.hmd_settings.device = -1;
++		U.hmd_settings.flag = (USER_HMD_USE_DEVICE_IPD | USER_HMD_USE_DEVICE_ROT | USER_HMD_USE_LENSDIST_FX);
++		U.hmd_settings.custom_ipd = 0.061f;
  	}
  
  	if (U.pixelsize == 0.0f)