Skip to content

Commit 21e6368

Browse files
committed
MPO: add null override list check
1 parent 5588e85 commit 21e6368

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

jme3-core/src/main/java/com/jme3/material/Technique.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,16 @@ Shader makeCurrent(RenderManager renderManager, List<MatParamOverride> overrides
128128
dynamicDefines.clear();
129129
dynamicDefines.setAll(paramDefines);
130130

131-
for (MatParamOverride override : overrides) {
132-
if (!override.isEnabled()) {
133-
continue;
134-
}
135-
Integer defineId = def.getShaderParamDefineId(override.name);
136-
if (defineId != null) {
137-
if (def.getDefineIdType(defineId) == override.type) {
138-
dynamicDefines.set(defineId, override.type, override.value);
131+
if (overrides != null) {
132+
for (MatParamOverride override : overrides) {
133+
if (!override.isEnabled()) {
134+
continue;
135+
}
136+
Integer defineId = def.getShaderParamDefineId(override.name);
137+
if (defineId != null) {
138+
if (def.getDefineIdType(defineId) == override.type) {
139+
dynamicDefines.set(defineId, override.type, override.value);
140+
}
139141
}
140142
}
141143
}

0 commit comments

Comments
 (0)