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

fixed a merge issue in the previous bomb merge

Browse Source
This commit is contained in:
Nehon 2016-07-07 20:48:13 +02:00
parent 16023fa481
commit 201010b6f0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,7 +778,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
return unit; return unit;
} }
private void updateShaderMaterialParameters(Renderer renderer, Shader shader, private int updateShaderMaterialParameters(Renderer renderer, Shader shader,
SafeArrayList<MatParamOverride> worldOverrides, SafeArrayList<MatParamOverride> forcedOverrides) { SafeArrayList<MatParamOverride> worldOverrides, SafeArrayList<MatParamOverride> forcedOverrides) {
int unit = 0; int unit = 0;