From 0dd27bda09d81da2ae4f96f576c5228a10d82726 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Mon, 14 Mar 2011 17:44:45 +0000 Subject: [PATCH] - Material does not check anymore if a param is defined when clearing it. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@6973 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/material/Material.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/src/core/com/jme3/material/Material.java b/engine/src/core/com/jme3/material/Material.java index ef85fb6d4..b9aedc78e 100644 --- a/engine/src/core/com/jme3/material/Material.java +++ b/engine/src/core/com/jme3/material/Material.java @@ -288,6 +288,7 @@ public class Material implements Cloneable, Savable, Comparable { private String checkSetParam(VarType type, String name) { MatParam paramDef = def.getMaterialParam(name); String newName = name; + if (paramDef == null && name.startsWith("m_")) { newName = name.substring(2); paramDef = def.getMaterialParam(newName); @@ -335,8 +336,9 @@ public class Material implements Cloneable, Savable, Comparable { * @param name the name of the parameter to clear */ public void clearParam(String name) { - name = checkSetParam(null, name); - + //On removal, we don't check if the param exists in the paramDef, and just go on with the process. + // name = checkSetParam(null, name); + MatParam matParam = getParam(name); if (matParam != null) { paramValues.remove(name); @@ -413,7 +415,7 @@ public class Material implements Cloneable, Savable, Comparable { */ public void setTexture(String name, Texture value) { if (value == null) { - // clear it + // clear it clearTextureParam(name); return; }