From c03e831f3c123b1a92a7c2ae2961077ec7ad9aef Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 2 Apr 2016 14:04:36 -0400 Subject: [PATCH] SkeletonControl: fix syntax error Conflicts: jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java --- .../src/main/java/com/jme3/animation/SkeletonControl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java b/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java index 2e0b17c3b..4a69c2d7c 100644 --- a/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java +++ b/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java @@ -111,7 +111,7 @@ public class SkeletonControl extends AbstractControl implements Cloneable, JmeCl * Material references used for hardware skinning */ private Set materials = new HashSet(); - + /** * Serialization only. Do not use. */ @@ -204,6 +204,9 @@ public class SkeletonControl extends AbstractControl implements Cloneable, JmeCl * @param skeleton the skeleton */ public SkeletonControl(Skeleton skeleton) { + if (skeleton == null) { + throw new IllegalArgumentException("skeleton cannot be null"); + } this.skeleton = skeleton; }