Skip to content

Commit

Permalink
Merge pull request #20799 from takahirox/FixGLTFExporter
Browse files Browse the repository at this point in the history
GLTFExporter: Fix undefined node name bug in mergeMorphTargetTracks()
  • Loading branch information
mrdoob committed Dec 3, 2020
2 parents cccaeb7 + 72d8db9 commit c642d2e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/js/exporters/GLTFExporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,7 @@ THREE.GLTFExporter.Utils = {

// We need to take into consideration the intended target node
// of our original un-merged morphTarget animation.
mergedTrack.name = sourceTrackBinding.nodeName + '.morphTargetInfluences';
mergedTrack.name = ( sourceTrackBinding.nodeName || '' ) + '.morphTargetInfluences';
mergedTrack.values = values;

mergedTracks[ sourceTrackNode.uuid ] = mergedTrack;
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/exporters/GLTFExporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2305,7 +2305,7 @@ GLTFExporter.Utils = {

// We need to take into consideration the intended target node
// of our original un-merged morphTarget animation.
mergedTrack.name = sourceTrackBinding.nodeName + '.morphTargetInfluences';
mergedTrack.name = ( sourceTrackBinding.nodeName || '' ) + '.morphTargetInfluences';
mergedTrack.values = values;

mergedTracks[ sourceTrackNode.uuid ] = mergedTrack;
Expand Down

0 comments on commit c642d2e

Please sign in to comment.