Skip to content

Commit c088021

Browse files
authored
Merge pull request #20880 from ryans1224/gltf-loader-sanitize-duplicated-node-name
GLTFLoader: Use sanitized name when creating unique node name for duplicated name
2 parents 3086c78 + 32a090c commit c088021

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

examples/js/loaders/GLTFLoader.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2846,11 +2846,13 @@ THREE.GLTFLoader = ( function () {
28462846
/** When Object3D instances are targeted by animation, they need unique names. */
28472847
GLTFParser.prototype.createUniqueName = function ( originalName ) {
28482848

2849-
var name = THREE.PropertyBinding.sanitizeNodeName( originalName || '' );
2849+
var sanitizedName = THREE.PropertyBinding.sanitizeNodeName( originalName || '' );
2850+
2851+
var name = sanitizedName;
28502852

28512853
for ( var i = 1; this.nodeNamesUsed[ name ]; ++ i ) {
28522854

2853-
name = originalName + '_' + i;
2855+
name = sanitizedName + '_' + i;
28542856

28552857
}
28562858

examples/jsm/loaders/GLTFLoader.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2911,11 +2911,13 @@ var GLTFLoader = ( function () {
29112911
/** When Object3D instances are targeted by animation, they need unique names. */
29122912
GLTFParser.prototype.createUniqueName = function ( originalName ) {
29132913

2914-
var name = PropertyBinding.sanitizeNodeName( originalName || '' );
2914+
var sanitizedName = PropertyBinding.sanitizeNodeName( originalName || '' );
2915+
2916+
var name = sanitizedName;
29152917

29162918
for ( var i = 1; this.nodeNamesUsed[ name ]; ++ i ) {
29172919

2918-
name = originalName + '_' + i;
2920+
name = sanitizedName + '_' + i;
29192921

29202922
}
29212923

0 commit comments

Comments
 (0)