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

* Prevent crash when material technique has no world bindings defined. Fixes issue 454

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9129 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..om 2012-02-02 18:08:06 +00:00
parent 230398c45b
commit b53a825d35
1 changed files with 263 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/src/core/com/jme3/material/Technique.java
View File

@ -228,13 +228,14 @@ public class Technique implements Savable {
// register the world bound uniforms // register the world bound uniforms
worldBindUniforms.clear(); worldBindUniforms.clear();
for (UniformBinding binding : def.getWorldBindings()) { if (def.getWorldBindings() != null) {
Uniform uniform = shader.getUniform("g_" + binding.name()); for (UniformBinding binding : def.getWorldBindings()) {
uniform.setBinding(binding); Uniform uniform = shader.getUniform("g_" + binding.name());
if (uniform != null) { uniform.setBinding(binding);
worldBindUniforms.add(uniform); if (uniform != null) {
worldBindUniforms.add(uniform);
} }
}
} }
needReload = false; needReload = false;