solve issue #1930 (NPE in FbxLayerElement) (#1931)

stephengold · Ali-RS · commit 8861ff5d1a4e · 2023-01-31T23:42:51.000+03:30
diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/mesh/FbxLayerElement.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/mesh/FbxLayerElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2020 jMonkeyEngine
+ * Copyright (c) 2009-2023 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -196,7 +196,7 @@ public static FbxLayerElement fromElement(FbxElement element) {
                 layerElement.name = (String) child.properties.get(0);
             }
         }
-        if (layerElement.data == null) {
+        if (layerElement.data == null && layerElement.dataIndices != null) {
             // For Smoothing / Materials, data = dataIndices
             layerElement.refInfoType = ReferenceInformationType.Direct;
             layerElement.data = new Integer[layerElement.dataIndices.length];

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2009-2020 jMonkeyEngine`
	`2`	`+ * Copyright (c) 2009-2023 jMonkeyEngine`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* Redistribution and use in source and binary forms, with or without`
`@@ -196,7 +196,7 @@ public static FbxLayerElement fromElement(FbxElement element) {`
`196`	`196`	`layerElement.name = (String) child.properties.get(0);`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- if (layerElement.data == null) {`
	`199`	`+ if (layerElement.data == null && layerElement.dataIndices != null) {`
`200`	`200`	`// For Smoothing / Materials, data = dataIndices`
`201`	`201`	`layerElement.refInfoType = ReferenceInformationType.Direct;`
`202`	`202`	`layerElement.data = new Integer[layerElement.dataIndices.length];`