Merge branch 'release' of github.com:away3d/away3d-core-fp11 into rel…

…ease
away3d · Jul 3, 2012 · 47ca01f · 47ca01f
2 parents ae5f33a + c50d5d2
commit 47ca01f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 282 deletions.
diff --git a/src/away3d/pbks/NormalizeSplats.pbj → pb/NormalizeSplats.pbj b/src/away3d/pbks/NormalizeSplats.pbj → pb/NormalizeSplats.pbj
diff --git a/src/away3d/pbks/NormalizeSplats.pbk → pb/NormalizeSplats.pbk b/src/away3d/pbks/NormalizeSplats.pbk → pb/NormalizeSplats.pbk
diff --git a/src/away3d/materials/BitmapMaterial.as b/src/away3d/materials/BitmapMaterial.as
diff --git a/src/away3d/materials/VideoMaterial.as b/src/away3d/materials/VideoMaterial.as
diff --git a/src/away3d/textures/SplatBlendBitmapTexture.as b/src/away3d/textures/SplatBlendBitmapTexture.as
@@ -9,7 +9,7 @@ package away3d.textures
 
 	public class SplatBlendBitmapTexture extends BitmapTexture
 	{
-		[Embed(source="../pbks/NormalizeSplats.pbj", mimeType="application/octet-stream")]
+		[Embed(source="/../pb/NormalizeSplats.pbj", mimeType="application/octet-stream")]
 		private var NormalizeKernel : Class;
 
 		private var _numSplattingLayers : int;