Merge branch 'master' into dev

e90fcf20 · Mr.doob · 1539ed68 · b5c272cf · e90fcf20
显示空白变更内容
内联并排

Showing with 3 addition and 3 deletion

src/helpers/GridHelper.d.ts src/helpers/GridHelper.d.ts +3 -3

未找到文件。
--- a/src/helpers/GridHelper.d.ts
+++ b/src/helpers/GridHelper.d.ts
@@ -6,12 +6,12 @@ export class GridHelper extends LineSegments {
 	constructor(
 		size: number,
 		divisions: number,
-		color1?: Color | number,
-		color2?: Color | number
+		color1?: Color | string | number,
+		color2?: Color | string | number
 	);
 	/**
 	 * @deprecated Colors should be specified in the constructor.
 	 */
-	setColors( color1?: Color | number, color2?: Color | number ): void;
+	setColors( color1?: Color | string | number, color2?: Color | string | number ): void;

 }