[Bf-blender-cvs] [bf426bd] HMD_viewport: Proper default value for custom HMD IPD

Julian Eisel noreply at git.blender.org
Wed Oct 12 20:09:16 CEST 2016


Commit: bf426bdf1ea2aae7b7501f9b4c72f27cb1672b9d
Author: Julian Eisel
Date:   Wed Oct 12 20:08:37 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBbf426bdf1ea2aae7b7501f9b4c72f27cb1672b9d

Proper default value for custom HMD IPD

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

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/intern/versioning_270.c

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

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index d215295..a008f46 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -170,6 +170,10 @@ void        BKE_scene_multiview_view_prefix_get(struct Scene *scene, const char
 void        BKE_scene_multiview_videos_dimensions_get(const struct RenderData *rd, const size_t width, const size_t height, size_t *r_width, size_t *r_height);
 int         BKE_scene_multiview_num_videos_get(const struct RenderData *rd);
 
+#ifdef WITH_INPUT_HMD
+void BKE_scene_hmd_settings_default_init(struct Scene *scene);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b902e0a..9bae970 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -813,9 +813,7 @@ void BKE_scene_init(Scene *sce)
 	sce->toolsettings->gpencil_seq_align = GP_PROJECT_VIEWSPACE;
 	sce->toolsettings->gpencil_ima_align = GP_PROJECT_VIEWSPACE;
 
-	/* HMD settings */
-	sce->hmd_settings.view_shade = OB_MATERIAL;
-	sce->hmd_settings.flag |= (HMDVIEW_USE_LENSDIST_FX | HMDVIEW_USE_DEVICE_IPD);
+	BKE_scene_hmd_settings_default_init(sce);
 }
 
 Scene *BKE_scene_add(Main *bmain, const char *name)
@@ -2586,3 +2584,12 @@ int BKE_scene_multiview_num_videos_get(const RenderData *rd)
 		return BKE_scene_multiview_num_views_get(rd);
 	}
 }
+
+#ifdef WITH_INPUT_HMD
+void BKE_scene_hmd_settings_default_init(Scene *scene)
+{
+	scene->hmd_settings.view_shade = OB_MATERIAL;
+	scene->hmd_settings.flag |= (HMDVIEW_USE_LENSDIST_FX | HMDVIEW_USE_DEVICE_IPD);
+	scene->hmd_settings.custom_ipd = 0.061f;
+}
+#endif
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 9c9d8eb..e2617d7 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1427,11 +1427,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 	}
 
 	{
+#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) {
-				scene->hmd_settings.view_shade = OB_MATERIAL;
-				scene->hmd_settings.flag |= (HMDVIEW_USE_LENSDIST_FX | HMDVIEW_USE_DEVICE_IPD);
+				BKE_scene_hmd_settings_default_init(scene);
 			}
 		}
 	}
+#endif
 }




More information about the Bf-blender-cvs mailing list