[Bf-blender-cvs] [284c7f72a1] HMD_viewport: Fix Vive compile option

[Joey Ferwerda]

Commit: 284c7f72a1767e899f776c335c99e519681b1134
Author: Joey Ferwerda
Date:   Sat Mar 4 15:56:06 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB284c7f72a1767e899f776c335c99e519681b1134

Fix Vive compile option

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

M	extern/openhmd/CMakeLists.txt
M	extern/openhmd/src/omath.c
M	extern/openhmd/src/omath.h

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

diff --git a/extern/openhmd/CMakeLists.txt b/extern/openhmd/CMakeLists.txt
index 6dfef7a707..7c0a1aa673 100644
--- a/extern/openhmd/CMakeLists.txt
+++ b/extern/openhmd/CMakeLists.txt
@@ -70,7 +70,7 @@ if(OPENHMD_DRIVER_DEEPOON)
 	list(APPEND INC_SYS ${HIDAPI_INCLUDE_DIRS})
 endif()
 
-if(OPENHMD_HTC_VIVE)
+if(OPENHMD_DRIVER_HTC_VIVE)
 	list(APPEND SRC
 		src/drv_htc_vive/vive.c
 		src/drv_htc_vive/packet.c
diff --git a/extern/openhmd/src/omath.c b/extern/openhmd/src/omath.c
index 9963441189..0a7bfaa850 100644
--- a/extern/openhmd/src/omath.c
+++ b/extern/openhmd/src/omath.c
@@ -28,6 +28,12 @@ void ovec3f_normalize_me(vec3f* me)
 	me->z /= len;
 }
 
+void ovec3f_subtract(const vec3f* a, const vec3f* b, vec3f* out)
+{
+	for(int i = 0; i < 3; i++)
+		out->arr[i] = a->arr[i] - b->arr[i];
+}
+
 float ovec3f_get_dot(const vec3f* me, const vec3f* vec)
 {
 	return me->x * vec->x + me->y * vec->y + me->z * vec->z;
diff --git a/extern/openhmd/src/omath.h b/extern/openhmd/src/omath.h
index 09041fc972..9fdf74082c 100644
--- a/extern/openhmd/src/omath.h
+++ b/extern/openhmd/src/omath.h
@@ -34,6 +34,7 @@ void ovec3f_normalize_me(vec3f* me);
 float ovec3f_get_length(const vec3f* me);
 float ovec3f_get_angle(const vec3f* me, const vec3f* vec); 
 float ovec3f_get_dot(const vec3f* me, const vec3f* vec);
+void ovec3f_subtract(const vec3f* a, const vec3f* b, vec3f* out);
 
 
 // quaternion