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 c586bacbb0
commit 2dafd1e485
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,7 @@ public final class Technique {
dynamicDefines.clear(); dynamicDefines.clear();
dynamicDefines.setAll(paramDefines); dynamicDefines.setAll(paramDefines);
if (overrides != null) {
for (MatParamOverride override : overrides) { for (MatParamOverride override : overrides) {
if (!override.isEnabled()) { if (!override.isEnabled()) {
continue; continue;
@ -139,6 +140,7 @@ public final class Technique {
} }
} }
} }
}
return logic.makeCurrent(assetManager, renderManager, rendererCaps, lights, dynamicDefines); return logic.makeCurrent(assetManager, renderManager, rendererCaps, lights, dynamicDefines);
} }