Skip to content

Commit 93e72ba

Browse files
committed
r104
1 parent 58b9580 commit 93e72ba

File tree

6 files changed

+38
-36
lines changed

6 files changed

+38
-36
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-
- [ ] r103
22+
- [ ] r104
2323
- [ ] ...
2424

2525
##### Browser

build/three.js

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

186186
} );
187187

188-
var REVISION = '104dev';
188+
var REVISION = '104';
189189
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
190190
var CullFaceNone = 0;
191191
var CullFaceBack = 1;
@@ -12044,9 +12044,10 @@
1204412044
var attribute2 = geometry.attributes[ key ];
1204512045
var attributeArray2 = attribute2.array;
1204612046

12047-
var attributeSize = attribute2.itemSize;
12047+
var attributeOffset = attribute2.itemSize * offset;
12048+
var length = Math.min( attributeArray2.length, attributeArray1.length - attributeOffset );
1204812049

12049-
for ( var i = 0, j = attributeSize * offset; i < attributeArray2.length; i ++, j ++ ) {
12050+
for ( var i = 0, j = attributeOffset; i < length; i ++, j ++ ) {
1205012051

1205112052
attributeArray1[ j ] = attributeArray2[ i ];
1205212053

@@ -24560,7 +24561,7 @@
2456024561

2456124562
} else if ( material.isShadowMaterial ) {
2456224563

24563-
m_uniforms.color.value = material.color;
24564+
m_uniforms.color.value.copy( material.color );
2456424565
m_uniforms.opacity.value = material.opacity;
2456524566

2456624567
}
@@ -24606,7 +24607,7 @@
2460624607

2460724608
if ( material.color ) {
2460824609

24609-
uniforms.diffuse.value = material.color;
24610+
uniforms.diffuse.value.copy( material.color );
2461024611

2461124612
}
2461224613

@@ -24736,7 +24737,7 @@
2473624737

2473724738
function refreshUniformsLine( uniforms, material ) {
2473824739

24739-
uniforms.diffuse.value = material.color;
24740+
uniforms.diffuse.value.copy( material.color );
2474024741
uniforms.opacity.value = material.opacity;
2474124742

2474224743
}
@@ -24751,7 +24752,7 @@
2475124752

2475224753
function refreshUniformsPoints( uniforms, material ) {
2475324754

24754-
uniforms.diffuse.value = material.color;
24755+
uniforms.diffuse.value.copy( material.color );
2475524756
uniforms.opacity.value = material.opacity;
2475624757
uniforms.size.value = material.size * _pixelRatio;
2475724758
uniforms.scale.value = _height * 0.5;
@@ -24774,7 +24775,7 @@
2477424775

2477524776
function refreshUniformsSprites( uniforms, material ) {
2477624777

24777-
uniforms.diffuse.value = material.color;
24778+
uniforms.diffuse.value.copy( material.color );
2477824779
uniforms.opacity.value = material.opacity;
2477924780
uniforms.rotation.value = material.rotation;
2478024781
uniforms.map.value = material.map;
@@ -24795,7 +24796,7 @@
2479524796

2479624797
function refreshUniformsFog( uniforms, fog ) {
2479724798

24798-
uniforms.fogColor.value = fog.color;
24799+
uniforms.fogColor.value.copy( fog.color );
2479924800

2480024801
if ( fog.isFog ) {
2480124802

@@ -24822,7 +24823,7 @@
2482224823

2482324824
function refreshUniformsPhong( uniforms, material ) {
2482424825

24825-
uniforms.specular.value = material.specular;
24826+
uniforms.specular.value.copy( material.specular );
2482624827
uniforms.shininess.value = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
2482724828

2482824829
if ( material.emissiveMap ) {

0 commit comments

Comments
 (0)