Browse Source

Merge pull request #740 from raheelx/DraggingFilesIntoHierarchy

Dragging files into hierarchy
JoshEngebretson 9 years ago
parent
commit
26cb05326e
1 changed files with 3 additions and 0 deletions
  1. 3 0
      Script/AtomicEditor/ui/frames/HierarchyFrame.ts

+ 3 - 0
Script/AtomicEditor/ui/frames/HierarchyFrame.ts

@@ -331,6 +331,9 @@ class HierarchyFrame extends Atomic.UIWidget {
 
 
     handleDragEnded(ev: Atomic.DragEndedEvent) {
     handleDragEnded(ev: Atomic.DragEndedEvent) {
 
 
+        if (!ev.dragObject.object)
+            return;
+
         var typeName = ev.dragObject.object.typeName;
         var typeName = ev.dragObject.object.typeName;
 
 
         var dropNode: Atomic.Node = this.scene.getNode(Number(this.hierList.hoverItemID));
         var dropNode: Atomic.Node = this.scene.getNode(Number(this.hierList.hoverItemID));