[Bf-blender-cvs] [8ec1bb0] HMD_viewport: Corrections for WITH_INPUT_HMD

[Julian Eisel]

Commit: 8ec1bb096626ebfca8c1443df0def03d8baed91e
Author: Julian Eisel
Date:   Sun Apr 10 21:06:45 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB8ec1bb096626ebfca8c1443df0def03d8baed91e

Corrections for WITH_INPUT_HMD

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

M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_windowmanager_types.h

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

diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 8364df3..7c4e52d 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -73,4 +73,8 @@ if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
+if(WITH_INPUT_HMD)
+	add_definitions(-DWITH_INPUT_HMD)
+endif()
+
 blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3e50105..659377a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6042,7 +6042,9 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
 	
 	id_us_ensure_real(&wm->id);
 	link_list(fd, &wm->windows);
+#ifdef WITH_INPUT_HMD
 	wm->win_hmd = newdataadr(fd, wm->win_hmd);
+#endif
 	
 	for (win = wm->windows.first; win; win = win->next) {
 		win->ghostwin = NULL;
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 463cdda..12c7ba4 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -122,9 +122,7 @@ typedef struct ReportTimerInfo {
 
 /* reports need to be before wmWindowManager */
 
-#ifdef WITH_INPUT_HMD
-#  define win_hmd win_hmd
-#else
+#ifndef WITH_INPUT_HMD
 #  ifdef __GNUC__
 #    define win_hmd win_hmd __attribute__ ((deprecated))
 #  endif