Fix NPE in Geometry's morph state (#2919) - #2920
Open
DieterDePaepe wants to merge 1 commit into
Open
Conversation
Geometry allocates its morphState array lazily. setMorphState(float[]) and
getMorphState() both create it on demand, but the name-based overloads
setMorphState(String, float) and getMorphState(String) indexed the field
directly, so calling either one first threw NullPointerException:
java.lang.NullPointerException: Cannot store to float array because
"this.morphState" is null
Nothing else populates the array. MorphControl only reads it, and the
control itself is attached by GltfLoader only when the asset carries an
animation channel targeting "weights". An application driving morph targets
from its own code -- expression blending, a slider, anything procedural --
therefore has an unallocated array precisely when it reaches for the
name-based setter, which is the natural one to use since it is the only API
that resolves a morph by name.
Route both overloads through getMorphState(), which already allocates on
demand, so the by-name and by-array paths behave alike. The lookup guard is
unchanged: an unknown name still writes nothing and reads -1.
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes lazy morph-state initialization for name-based accessors.
Changes:
- Routes name-based reads and writes through the allocating getter.
- Adds regression tests for allocation and unknown names.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
Geometry.java |
Prevents NPEs in name-based morph access. |
GeometryMorphStateTest.java |
Tests lazy allocation and lookup behavior. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Geometry allocates its morphState array lazily. setMorphState(float[]) and getMorphState() both create it on demand, but the name-based overloads setMorphState(String, float) and getMorphState(String) indexed the field directly, so calling either one first threw NullPointerException:
Nothing else populates the array. MorphControl only reads it, and the control itself is attached by GltfLoader only when the asset carries an animation channel targeting "weights". An application driving morph targets from its own code -- expression blending, a slider, anything procedural -- therefore has an unallocated array precisely when it reaches for the name-based setter, which is the natural one to use since it is the only API that resolves a morph by name.
Route both overloads through getMorphState(), which already allocates on demand, so the by-name and by-array paths behave alike. The lookup guard is unchanged: an unknown name still writes nothing and reads -1.