sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Material.preload(): fix incorrect param names being uploaded (w/o prefix)

Browse Source 
- This would cause garbage uniforms to be allocated when testing for HW skinning
This commit is contained in:
shadowislord 2015-02-24 21:52:42 -05:00
parent 3a19a2bb12
commit 32e56351df
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jme3-core/src/main/java/com/jme3/material/Material.java
View File

@ -1056,12 +1056,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
Collection<MatParam> params = paramValues.values(); Collection<MatParam> params = paramValues.values();
for (MatParam param : params) { for (MatParam param : params) {
if (param instanceof MatParamTexture) { param.apply(r, technique);
MatParamTexture texParam = (MatParamTexture) param;
r.setTexture(0, texParam.getTextureValue());
} else {
technique.updateUniformParam(param.getName(), param.getVarType(), param.getValue());
}
} }
r.setShader(technique.getShader()); r.setShader(technique.getShader());