Skip to content

Commit 7043802

Browse files
committed
r100
1 parent a6e5353 commit 7043802

File tree

6 files changed

+167
-147
lines changed

6 files changed

+167
-147
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
1919
##### Three.js version
2020

2121
- [ ] Dev
22-
- [ ] r99
22+
- [ ] r100
2323
- [ ] ...
2424

2525
##### Browser

build/three.js

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185

186186
} );
187187

188-
var REVISION = '100dev';
188+
var REVISION = '100';
189189
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
190190
var CullFaceNone = 0;
191191
var CullFaceBack = 1;
@@ -13144,6 +13144,16 @@
1314413144
data.vertexShader = this.vertexShader;
1314513145
data.fragmentShader = this.fragmentShader;
1314613146

13147+
var extensions = {};
13148+
13149+
for ( var key in this.extensions ) {
13150+
13151+
if ( this.extensions[ key ] === true ) extensions[ key ] = true;
13152+
13153+
}
13154+
13155+
if ( Object.keys( extensions ).length > 0 ) data.extensions = extensions;
13156+
1314713157
return data;
1314813158

1314913159
};
@@ -14243,17 +14253,7 @@
1424314253

1424414254
if ( morphTargets !== undefined && morphTargets.length > 0 ) {
1424514255

14246-
this.morphTargetInfluences = [];
14247-
this.morphTargetDictionary = {};
14248-
14249-
for ( m = 0, ml = morphTargets.length; m < ml; m ++ ) {
14250-
14251-
name = morphTargets[ m ].name || String( m );
14252-
14253-
this.morphTargetInfluences.push( 0 );
14254-
this.morphTargetDictionary[ name ] = m;
14255-
14256-
}
14256+
console.error( 'THREE.Mesh.updateMorphTargets() no longer supports THREE.Geometry. Use THREE.BufferGeometry instead.' );
1425714257

1425814258
}
1425914259

@@ -37339,6 +37339,16 @@
3733937339
if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
3734037340
if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;
3734137341

37342+
if ( json.extensions !== undefined ) {
37343+
37344+
for ( var key in json.extensions ) {
37345+
37346+
material.extensions[ key ] = json.extensions[ key ];
37347+
37348+
}
37349+
37350+
}
37351+
3734237352
// Deprecated
3734337353

3734437354
if ( json.shading !== undefined ) material.flatShading = json.shading === 1; // THREE.FlatShading

0 commit comments

Comments
 (0)