From ef77d2b3427149b737df418fe77b06e3598fc5cc Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 14 Feb 2019 15:31:21 +0800 Subject: [PATCH] improve properties declaration (#3842) * improve properties declaration * cherry pick: CCClass: allow array type working togather with getter (#3545) Commit: 37f4f06419a7b6a68283a4d1e46ff937bdccb941 [37f4f064] --- cocos/3d/framework/renderable-component.ts | 1 - cocos/core/data/utils/preprocess-class.js | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cocos/3d/framework/renderable-component.ts b/cocos/3d/framework/renderable-component.ts index f1c856df6f..1205e7cf91 100644 --- a/cocos/3d/framework/renderable-component.ts +++ b/cocos/3d/framework/renderable-component.ts @@ -18,7 +18,6 @@ export class RenderableComponent extends Component { } @property({ - default: [], type: Material, displayName: 'Materials', }) diff --git a/cocos/core/data/utils/preprocess-class.js b/cocos/core/data/utils/preprocess-class.js index 7e09b7eb02..83eae179b2 100644 --- a/cocos/core/data/utils/preprocess-class.js +++ b/cocos/core/data/utils/preprocess-class.js @@ -136,9 +136,8 @@ function checkUrl (val, className, propName, url) { function parseType (val, type, className, propName) { if (Array.isArray(type)) { - if (CC_EDITOR) { - var isArray = cc.Class.isArray; // require lazily to avoid circular require() calls - if (!isArray(val.default)) { + if (CC_EDITOR && 'default' in val) { + if (!cc.Class.isArray(val.default)) { cc.warnID(5507, className, propName); } }