Merge branch 'dev'

away3d · Jan 24, 2014 · 3e030cc · 3e030cc
2 parents 3858115 + e795812
commit 3e030cc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/away3d/core/managers/Touch3DManager.as b/src/away3d/core/managers/Touch3DManager.as
@@ -207,6 +207,9 @@ package away3d.core.managers
 		{
 
 			var touch:TouchPoint = _touchPointFromId[ event.touchPointID ];
+
+			if (!touch) return;
+
 			touch.x = event.stageX;
 			touch.y = event.stageY;
 
@@ -222,6 +225,8 @@ package away3d.core.managers
 
 			var touch:TouchPoint = _touchPointFromId[ event.touchPointID ];
 
+			if (!touch) return;
+
 			_collidingObject = _collidingObjectFromTouchId[ touch.id ];
 			if (_collidingObject)
 				queueDispatch(TouchEvent3D.TOUCH_END, event, _collidingObject, touch);