瀏覽代碼

Merge pull request #157 from sepharoth213/master

Compile Fixes
Nicolas Cannasse 9 年之前
父節點
當前提交
ef78a187ec
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      h3d/impl/NullDriver.hx
  2. 1 1
      h3d/shader/Texture2.hx

+ 3 - 3
h3d/impl/NullDriver.hx

@@ -48,15 +48,15 @@ class NullDriver extends Driver {
 	}
 
 	override function allocTexture( t : h3d.mat.Texture ) : Texture {
-		return {};
+		return null;
 	}
 
 	override function allocIndexes( count : Int ) : IndexBuffer {
-		return {};
+		return null;
 	}
 
 	override function allocVertexes( m : ManagedBuffer ) : VertexBuffer {
-		return {};
+		return null;
 	}
 
 }

+ 1 - 1
h3d/shader/Texture2.hx

@@ -36,7 +36,7 @@ class Texture2 extends hxsl.Shader {
 	public function new(?tex) {
 		super();
 		this.texture = tex;
-		this.killAlphaThreshold = h3d.pass.Params.defaultKillAlphaThreshold;
+		this.killAlphaThreshold = h3d.mat.Defaults.defaultKillAlphaThreshold;
 	}
 
 }