From 99561bec725b12e731e87f413a4d11c4a73b993a Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Thu, 20 Feb 2025 00:23:09 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"AnimComposer:=20return=20AnimLaye?= =?UTF-8?q?r=20on=20the=20makeLayer=20and=20removeLayer=20metho=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit deef7489a0d4cb13b50fd105214cfdd58b479686. --- .../src/main/java/com/jme3/anim/AnimComposer.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java index 18c64cba52..06ac79023c 100644 --- a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java +++ b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2024 jMonkeyEngine + * Copyright (c) 2009-2022 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -313,24 +313,21 @@ public Action removeAction(String name) { /** * Add a layer to this composer. * - * @param name The desired name for the new layer - * @param mask The desired mask for the new layer (alias created) - * @return a new layer + * @param name the desired name for the new layer + * @param mask the desired mask for the new layer (alias created) */ - public AnimLayer makeLayer(String name, AnimationMask mask) { + public void makeLayer(String name, AnimationMask mask) { AnimLayer l = new AnimLayer(name, mask); layers.put(name, l); - return l; } /** * Remove specified layer. This will stop the current action on this layer. * * @param name The name of the layer to remove. - * @return The removed layer. */ - public AnimLayer removeLayer(String name) { - return layers.remove(name); + public void removeLayer(String name) { + layers.remove(name); } /** From b92c645fb3817880fb05f85468ec9306abd91c12 Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Thu, 20 Feb 2025 00:24:47 -0500 Subject: [PATCH 2/2] Update AnimComposer.java --- jme3-core/src/main/java/com/jme3/anim/AnimComposer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java index 06ac79023c..4a47008542 100644 --- a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java +++ b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2022 jMonkeyEngine + * Copyright (c) 2009-2025 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without