From 89f664c0ee4210aeef24d517982bb69fe4533a9f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 5 Mar 2014 11:52:47 -0800 Subject: [PATCH] fixing incorrect documentation comment --- interface/src/renderer/Model.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h index 4f0e789ef0..fc4643374f 100644 --- a/interface/src/renderer/Model.h +++ b/interface/src/renderer/Model.h @@ -202,7 +202,7 @@ protected: glm::vec3 translation; // translation relative to parent glm::quat rotation; // rotation relative to parent glm::mat4 transform; // rotation to world frame + translation in model frame - glm::quat combinedRotation; // rotation to model frame + glm::quat combinedRotation; // rotation from joint local to world frame }; bool _shapesAreDirty;