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

[Bastien Montagne]

Commit: 8e1cf5237f2eaa0a77708a6df9c2d279ca16ecd9
Author: Bastien Montagne
Date:   Thu Nov 3 20:10:55 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB8e1cf5237f2eaa0a77708a6df9c2d279ca16ecd9

Merge branch 'master' into HMD_viewport

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 85960e1,14e02c9..d4a4437
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1427,12 -1427,16 +1427,24 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
+ 		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ 			if (scene->toolsettings != NULL) {
+ 				ToolSettings *ts = scene->toolsettings;
+ 				ParticleEditSettings *pset = &ts->particle;
+ 				for (int a = 0; a < PE_TOT_BRUSH; a++) {
+ 					if (pset->brush[a].count == 0) {
+ 						pset->brush[a].count = 10;
+ 					}
+ 				}
+ 			}
+ 		}
++
 +#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
  	}
  }