fixed a merge issue in the previous bomb merge

9 years ago · 201010b6f0
parent 16023fa481
commit 201010b6f0
1 changed files with 1 additions and 1 deletions
--- a/jme3-core/src/main/java/com/jme3/material/Material.java
+++ b/jme3-core/src/main/java/com/jme3/material/Material.java
@ -778,7 +778,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
        return unit;
    }

-    private void updateShaderMaterialParameters(Renderer renderer, Shader shader,
+    private int updateShaderMaterialParameters(Renderer renderer, Shader shader,
                 SafeArrayList<MatParamOverride> worldOverrides, SafeArrayList<MatParamOverride> forcedOverrides) {

        int unit = 0;