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

Fixed an issue with shaderNodes loading

Browse Source
This commit is contained in:
Nehon 2016-04-11 20:19:16 +02:00
parent 8d4962d11f
commit c859cf375c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
View File

@ -621,9 +621,7 @@ public class J3MLoader implements AssetLoader {
// Not sure if this is needed anymore, since shader caching // Not sure if this is needed anymore, since shader caching
// is now done by TechniqueDef. // is now done by TechniqueDef.
technique.setShaderFile(technique.hashCode() + "", technique.hashCode() + "", "GLSL100", "GLSL100"); technique.setShaderFile(technique.hashCode() + "", technique.hashCode() + "", "GLSL100", "GLSL100");
} }else if (shaderNames.containsKey(Shader.ShaderType.Vertex) && shaderNames.containsKey(Shader.ShaderType.Fragment)) {
if (shaderNames.containsKey(Shader.ShaderType.Vertex) && shaderNames.containsKey(Shader.ShaderType.Fragment)) {
technique.setShaderFile(shaderNames, shaderLanguages); technique.setShaderFile(shaderNames, shaderLanguages);
} else { } else {
technique = null; technique = null;