From 201010b6f0bf8d65bdf04fdbcd2d178db9cf95e6 Mon Sep 17 00:00:00 2001
From: Nehon <remy.bouquet@gmail.com>
Date: Thu, 7 Jul 2016 20:48:13 +0200
Subject: [PATCH] fixed a merge issue in the previous bomb merge

---
 jme3-core/src/main/java/com/jme3/material/Material.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java
index 34e827988..a25011d16 100644
--- 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;