Merge branch 'PBRisComing' # Conflicts: # jme3-core/src/main/java/com/jme3/material/Material.java # jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java