瀏覽代碼

Making sure input material is set (#539)

Rasmus Brinck 6 年之前
父節點
當前提交
c0a0904e5c
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      h3d/parts/GpuParticles.hx

+ 1 - 1
h3d/parts/GpuParticles.hx

@@ -548,12 +548,12 @@ class GpuParticles extends h3d.scene.MultiMaterial {
 			material.mainPass.culling = None;
 			material.mainPass.culling = None;
 			material.mainPass.depthWrite = false;
 			material.mainPass.depthWrite = false;
 			material.blendMode = Alpha;
 			material.blendMode = Alpha;
-			if( this.material == null ) this.material = material;
 			if( g.material != null ) {
 			if( g.material != null ) {
 				material.props = g.getMaterialProps();
 				material.props = g.getMaterialProps();
 				material.name = g.name;
 				material.name = g.name;
 			}
 			}
 		}
 		}
+		if( this.material == null ) this.material = material;
 		material.mainPass.addShader(g.pshader);
 		material.mainPass.addShader(g.pshader);
 		if( index == null )
 		if( index == null )
 			index = groups.length;
 			index = groups.length;