Merge remote-tracking branch 'upstream/v3.4.0' into share/NewGenAnim

shrinktofit · Aug 31, 2021 · 4391043 · 4391043
2 parents 18c2ee6 + 5146f67
commit 4391043
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cocos/core/data/editor-extendable.ts b/cocos/core/data/editor-extendable.ts
@@ -20,6 +20,8 @@ export function EditorExtendableMixin<T> (Base: new (...args: any[]) => T, class
     return editorExtendableInternal(Base);
 }
 
+class Empty {}
+
 /**
  * Class which implements the `EditorExtendableObject` interface.
  */
@@ -36,7 +38,7 @@ function editorExtendableInternal<T> (Base?: (new (...args: any[]) => T), classN
     type ResultType = new (...args: any[]) => (T & EditorExtendableObject);
 
     if (!EDITOR) {
-        return (Base ?? Object) as unknown as ResultType;
+        return (Base ?? Empty) as unknown as ResultType;
     }
 
     let name: string;