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

MPO: add null override list check

Browse Source
This commit is contained in:
Kirill Vainer 2016-03-08 19:33:51 -05:00
parent 5588e859cb
commit 21e63687cf
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jme3-core/src/main/java/com/jme3/material/Technique.java
View File

@ -128,14 +128,16 @@ public final class Technique {
dynamicDefines.clear(); dynamicDefines.clear();
dynamicDefines.setAll(paramDefines); dynamicDefines.setAll(paramDefines);
for (MatParamOverride override : overrides) { if (overrides != null) {
if (!override.isEnabled()) { for (MatParamOverride override : overrides) {
continue; if (!override.isEnabled()) {
} continue;
Integer defineId = def.getShaderParamDefineId(override.name); }
if (defineId != null) { Integer defineId = def.getShaderParamDefineId(override.name);
if (def.getDefineIdType(defineId) == override.type) { if (defineId != null) {
dynamicDefines.set(defineId, override.type, override.value); if (def.getDefineIdType(defineId) == override.type) {
dynamicDefines.set(defineId, override.type, override.value);
}
} }
} }
} }