Minor checks and cleanup on scene events handling

h3d/scene/Scene.hx

@@ -219,8 +219,9 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 				continue;
 			}
 
-			if( !event.propagate )
-				hitInteractives = [];
+			if( !event.propagate ) {
+				while( hitInteractives.length > 0 ) hitInteractives.pop();
+			}
 
 			return i;
 		}
@@ -252,13 +253,16 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 
 	@:allow(h3d)
 	function addEventTarget(i:Interactive) {
+		if( interactives.indexOf(i) >= 0 ) throw "assert";
 		interactives.push(i);
 	}
 
 	@:allow(h3d)
 	function removeEventTarget(i:Interactive) {
-		if( interactives.remove(i) && events != null )
-			@:privateAccess events.onRemove(i);
+		if( interactives.remove(i) ) {
+			if( events != null ) @:privateAccess events.onRemove(i);
+			hitInteractives.remove(i);
+		}
 	}
 
 	/**

hxd/SceneEvents.hx

@@ -188,20 +188,19 @@ class SceneEvents {
 							event.propagate = oldPropagate;
 							event.cancel = false;
 						} else {
-							var o = overList[idx];
 							if ( idx < overIndex ) {
 								do {
 									overList[idx] = overList[idx + 1];
 									idx++;
 								} while ( idx < overIndex );
-								overList[overIndex] = o;
+								overList[overIndex] = i;
 								updateCursor = true;
 							} else if ( idx > overIndex ) {
 								do {
 									overList[idx] = overList[idx - 1];
 									idx--;
 								} while ( idx > overIndex );
-								overList[overIndex] = o;
+								overList[overIndex] = i;
 								updateCursor = true;
 							}
 							fillOver = i.propagateEvents;