[Bf-blender-cvs] [06e9f3304ce] HMD_viewport: Numeral small fixes from upstream 0.3rc

Joey Ferwerda noreply at git.blender.org
Fri Mar 31 17:29:26 CEST 2017


Commit: 06e9f3304cec5d821f95b9c0d8b02b09200b4b09
Author: Joey Ferwerda
Date:   Fri Mar 31 17:28:19 2017 +0200
Branches: HMD_viewport
https://developer.blender.org/rB06e9f3304cec5d821f95b9c0d8b02b09200b4b09

Numeral small fixes from upstream 0.3rc

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

M	extern/openhmd/src/drv_deepoon/packet.c
M	extern/openhmd/src/drv_oculus_rift/packet.c
M	extern/openhmd/src/openhmd.c

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

diff --git a/extern/openhmd/src/drv_deepoon/packet.c b/extern/openhmd/src/drv_deepoon/packet.c
index a4d6509b5db..28aaebf595f 100644
--- a/extern/openhmd/src/drv_deepoon/packet.c
+++ b/extern/openhmd/src/drv_deepoon/packet.c
@@ -58,8 +58,9 @@ bool dp_decodesensor_display_info(pkt_sensor_display_info* info, const unsigned
 
 	info->distortion_type_opts = 0;
 
-	for(int i = 0; i < 6; i++)
+	for(int i = 0; i < 6; i++){
 		info->distortion_k[i] = READFLOAT;
+	}
 
 	return true;
 }
diff --git a/extern/openhmd/src/drv_oculus_rift/packet.c b/extern/openhmd/src/drv_oculus_rift/packet.c
index 0e7c56fef16..080bf2b0b5a 100644
--- a/extern/openhmd/src/drv_oculus_rift/packet.c
+++ b/extern/openhmd/src/drv_oculus_rift/packet.c
@@ -58,8 +58,9 @@ bool decode_sensor_display_info(pkt_sensor_display_info* info, const unsigned ch
 
 	info->distortion_type_opts = 0;
 
-	for(int i = 0; i < 6; i++)
+	for(int i = 0; i < 6; i++){
 		info->distortion_k[i] = READFLOAT;
+	}
 
 	return true;
 }
diff --git a/extern/openhmd/src/openhmd.c b/extern/openhmd/src/openhmd.c
index 99595ff9691..ec2236a1ebe 100644
--- a/extern/openhmd/src/openhmd.c
+++ b/extern/openhmd/src/openhmd.c
@@ -328,13 +328,13 @@ static int ohmd_device_getf_unp(ohmd_device* device, ohmd_float_value type, floa
 		for (int i = 0; i < 4; i++) {
 			out[i] = device->properties.universal_distortion_k[i];
 		}
-		break;
+		return OHMD_S_OK;
 	}
 	case OHMD_UNIVERSAL_ABERRATION_K: {
 		for (int i = 0; i < 3; i++) {
 			out[i] = device->properties.universal_aberration_k[i];
 		}
-		break;
+		return OHMD_S_OK;
 	}
 	default:
 		return device->getf(device, type, out);
@@ -569,4 +569,4 @@ void ohmd_set_universal_aberration_k(ohmd_device_properties* props, float r, flo
 	props->universal_aberration_k[0] = r;
 	props->universal_aberration_k[1] = g;
 	props->universal_aberration_k[2] = b;
-}
\ No newline at end of file
+}




More information about the Bf-blender-cvs mailing list