Pārlūkot izejas kodu

Fix crash when closing a scene resource editor

Josh Engebretson 10 gadi atpakaļ
vecāks
revīzija
b5460a8fa9

+ 0 - 82
Script/AtomicEditor/AtomicWork.d.ts

@@ -1,82 +0,0 @@
-/// <reference path="/Users/josh/Dev/atomic/AtomicGameEngine/Bin/Atomic.d.ts" />
-/// <reference path="/Users/josh/Dev/atomic/AtomicGameEngine/Bin/ToolCore.d.ts" />
-/// <reference path="/Users/josh/Dev/atomic/AtomicGameEngine/Bin/Editor.d.ts" />
-
-declare module Atomic {
-
-    export interface PathInfo {
-
-      pathName: string;
-      fileName: string;
-      ext: string;
-
-    }
-
-    /*
-        export enum UIWidgetEventType {
-
-        EVENT_TYPE_CLICK,
-        EVENT_TYPE_LONG_CLICK,
-        EVENT_TYPE_POINTER_DOWN,
-        EVENT_TYPE_POINTER_UP,
-        EVENT_TYPE_POINTER_MOVE,
-        EVENT_TYPE_RIGHT_POINTER_DOWN,
-        EVENT_TYPE_RIGHT_POINTER_UP,
-        EVENT_TYPE_WHEEL,
-        EVENT_TYPE_CHANGED,
-        EVENT_TYPE_KEY_DOWN,
-        EVENT_TYPE_KEY_UP,
-        EVENT_TYPE_SHORTCUT,
-        EVENT_TYPE_CONTEXT_MENU,
-        EVENT_TYPE_FILE_DROP,
-        EVENT_TYPE_TAB_CHANGED,
-        EVENT_TYPE_CUSTOM
-        }
-    */
-    export interface UIWidgetEvent {
-
-        handler: UIWidget;
-        target: UIWidget;
-        type: number; /*UIWidgetEventType*/
-        x: number;
-        y: number;
-        deltax: number;
-        deltay: number;
-        count: number;
-        key: number;
-        specialkey: number;
-        modifierkeys: number;
-        refid: string;
-        touch: boolean;
-    }
-
-    export interface AttributeInfo {
-
-      type:VariantType;
-      name:string;
-      mode:number; // AM_*
-      defaultValue:string;
-      enumNames:string[];
-
-    }
-
-    export function getArguments(): Array<string>;
-    export function getEngine(): Engine;
-    export function getInput(): Input;
-    export function getGraphics(): Graphics;
-    export function getFileSystem(): FileSystem;
-    export function getResourceCache(): ResourceCache;
-
-    export function getParentPath(path: string): string;
-    export function addTrailingSlash(path: string): string;
-		export function getExtension(path: string): string;
-
-    export function splitPath(path: string): PathInfo;
-
-}
-
-declare module ToolCore {
-    export function getToolEnvironment(): ToolEnvironment;
-    export function getToolSystem(): ToolSystem;
-    export function getAssetDatabase(): AssetDatabase;
-}

+ 3 - 0
Source/AtomicEditorWork/Editors/SceneEditor3D/SceneView3D.cpp

@@ -235,6 +235,9 @@ void SceneView3D::DrawNodeDebug(Node* node, DebugRenderer* debug, bool drawNode)
 
 bool SceneView3D::MouseInView()
 {
+    if (!GetInternalWidget())
+        return false;
+
     Input* input = GetSubsystem<Input>();
     IntVector2 pos = input->GetMousePosition();