Merge branch 'master' of https://github.com/SalomonBrys/scenejs

wjlgryx · Dec 13, 2010 · af690ba · af690ba
2 parents b373146 + 87e3c3a
commit af690ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/scenejs/core/math.js b/src/scenejs/core/math.js
@@ -1960,7 +1960,7 @@ SceneJS._math_slerp = function(t, q1, q2) {
 };
 
 SceneJS._math_normalizeQuaternion = function(q) {
-    var len = SceneJS._math_lenVec3([q[0], q[1], q[2]]);
+    var len = SceneJS._math_lenVec4([q[0], q[1], q[2], q[3]]);
     return [ q[0] / len, q[1] / len, q[2] / len, q[3] / len ];
 };
 

diff --git a/src/scenejs/core/withNode.js b/src/scenejs/core/withNode.js
@@ -82,7 +82,7 @@ SceneJS._WithNode.prototype.eachParent = function(fn) {
     }
     var selector;
     var count = 0;
-    var node = this._targetNode._parent;
+    var node = this._targetNode;
     while (node._parent) {
         selector = new SceneJS._WithNode(node._parent);
         if (fn.call(selector, count++) === true) {