From 32e56351df99596738a96c601482fec6ffd3ddc8 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Tue, 24 Feb 2015 21:52:42 -0500 Subject: [PATCH] Material.preload(): fix incorrect param names being uploaded (w/o prefix) - This would cause garbage uniforms to be allocated when testing for HW skinning --- jme3-core/src/main/java/com/jme3/material/Material.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java index f852fa6f9..520362f40 100644 --- a/jme3-core/src/main/java/com/jme3/material/Material.java +++ b/jme3-core/src/main/java/com/jme3/material/Material.java @@ -1056,12 +1056,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { Collection params = paramValues.values(); for (MatParam param : params) { - if (param instanceof MatParamTexture) { - MatParamTexture texParam = (MatParamTexture) param; - r.setTexture(0, texParam.getTextureValue()); - } else { - technique.updateUniformParam(param.getName(), param.getVarType(), param.getValue()); - } + param.apply(r, technique); } r.setShader(technique.getShader());