Issue 7: Handle empty skins

defold · Oct 25, 2021 · 914c2c2 · 914c2c2
1 parent 639b661
commit 914c2c2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/defold-spine/plugins/lib/x86_64-linux/libSpineExt.so b/defold-spine/plugins/lib/x86_64-linux/libSpineExt.so
diff --git a/defold-spine/plugins/lib/x86_64-osx/libSpineExt.dylib b/defold-spine/plugins/lib/x86_64-osx/libSpineExt.dylib
diff --git a/defold-spine/plugins/lib/x86_64-win32/libSpineExt.dll b/defold-spine/plugins/lib/x86_64-win32/libSpineExt.dll
diff --git a/defold-spine/plugins/share/pluginSpineExt.jar b/defold-spine/plugins/share/pluginSpineExt.jar
diff --git a/defold-spine/pluginsrc/com/defold/bob/pipeline/SpineSceneUtil.java b/defold-spine/pluginsrc/com/defold/bob/pipeline/SpineSceneUtil.java
@@ -962,6 +962,9 @@ public static SpineSceneUtil loadJson(InputStream is, UVTransformProvider uvTran
 
                     if (!skinName.equals("default"))
                     {
+                        if (attachments == null) {
+                            throw new LoadException(String.format("Skin without attachments found: '%s'", skinName));
+                        }
                         List<SkinSlot> skin = loadSkin(scene, skinName, attachments, uvTransformProvider);
                         scene.skins.put(skinName, skin);
                     }
@@ -975,6 +978,9 @@ public static SpineSceneUtil loadJson(InputStream is, UVTransformProvider uvTran
                     JsonNode skinNode = entry.getValue();
                     if (!skinName.equals("default"))
                     {
+                        if (skinNode == null) {
+                            throw new LoadException(String.format("Skin without attachments found: '%s'", skinName));
+                        }
                         List<SkinSlot> skin = loadSkin(scene, skinName, skinNode, uvTransformProvider);
                         scene.skins.put(skinName, skin);
                     }

diff --git a/utils/build_plugins.sh b/utils/build_plugins.sh
@@ -10,7 +10,7 @@ if [ "" == "${BOB}" ]; then
     BOB=./bob.jar
 
     # comment out when you want to use the bob version instead!
-    DEFOLDSDK="--defoldsdk=eb061db73144081bd125b4a028a5ae9a180fc9b6"
+    DEFOLDSDK="--defoldsdk=6bfeea3b13d7b8920483ea2cba9c181a8650b84d"
 fi
 #BOB=~/work/defold/tmp/dynamo_home/share/java/bob.jar