From 6425c6883613aebe9167f20a44b2388b7237c017 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Tue, 16 Jul 2019 10:48:51 -0700 Subject: [PATCH 1/2] fix for self assignment warning --- libraries/animation/src/AnimInverseKinematics.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp index ed3d5d67d6..8d98f9c775 100644 --- a/libraries/animation/src/AnimInverseKinematics.cpp +++ b/libraries/animation/src/AnimInverseKinematics.cpp @@ -431,7 +431,6 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const constrained = constraint->apply(tipRelativeRotation); if (constrained) { tipOrientation = tipParentOrientation * tipRelativeRotation; - tipRelativeRotation = tipRelativeRotation; } } From a31c83400948b7cd079ef03a253a9e5f756f3db0 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Tue, 16 Jul 2019 10:49:37 -0700 Subject: [PATCH 2/2] macos include fix. On macos with a case sensitive harddrive this include fails. Change it to the more standard form. --- plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp index e6b555443f..a8ad10a9a0 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include #include