[Bf-blender-cvs] [b7beb76] HMD_viewport: Fix compiling without WITH_INPUT_HMD

Julian Eisel noreply at git.blender.org
Fri Oct 28 20:52:45 CEST 2016


Commit: b7beb762119427303970ff60500c5f47240f28fe
Author: Julian Eisel
Date:   Fri Oct 28 20:52:30 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBb7beb762119427303970ff60500c5f47240f28fe

Fix compiling without WITH_INPUT_HMD

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 550c840..2c1d4bd 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -813,7 +813,9 @@ void BKE_scene_init(Scene *sce)
 	sce->toolsettings->gpencil_seq_align = GP_PROJECT_VIEWSPACE;
 	sce->toolsettings->gpencil_ima_align = GP_PROJECT_VIEWSPACE;
 
+#ifdef WITH_INPUT_HMD
 	BKE_scene_hmd_settings_default_init(sce);
+#endif
 }
 
 Scene *BKE_scene_add(Main *bmain, const char *name)
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index e2617d7..85960e1 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1433,6 +1433,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				BKE_scene_hmd_settings_default_init(scene);
 			}
 		}
-	}
 #endif
+	}
 }




More information about the Bf-blender-cvs mailing list