浏览代码

Merge pull request #281 from daner/shader-patch

Adjusted type of shaderPath in shaderMaterial.
deltakosh 11 年之前
父节点
当前提交
485d549c9e
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Babylon/Materials/babylon.shaderMaterial.ts

+ 2 - 2
Babylon/Materials/babylon.shaderMaterial.ts

@@ -1,6 +1,6 @@
 module BABYLON {
     export class ShaderMaterial extends Material {
-        private _shaderPath: string;
+        private _shaderPath: any;
         private _options: any;
         private _textures = new Array<Texture>();
         private _floats = new Array<number>();
@@ -12,7 +12,7 @@
         private _matrices = new Array<Matrix>();
         private _cachedWorldViewMatrix = new BABYLON.Matrix();
 
-        constructor(name: string, scene: Scene, shaderPath: string, options) {
+        constructor(name: string, scene: Scene, shaderPath: any, options: any) {
             super(name, scene);
             this._shaderPath = shaderPath;