|
@@ -24167,6 +24167,12 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ if ( object.isInstancedMesh === true ) {
|
|
|
+
|
|
|
+ updateBuffers = true;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
//
|
|
|
|
|
|
var index = geometry.index;
|
|
@@ -24937,7 +24943,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
materialProperties.program = program;
|
|
|
materialProperties.uniforms = parameters.uniforms;
|
|
|
- materialProperties.outputEncoding = _this.outputEncoding;
|
|
|
+ materialProperties.outputEncoding = parameters.outputEncoding;
|
|
|
material.program = program;
|
|
|
|
|
|
}
|
|
@@ -25035,6 +25041,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
var fog = scene.fog;
|
|
|
var environment = material.isMeshStandardMaterial ? scene.environment : null;
|
|
|
+ var encoding = ( _currentRenderTarget === null ) ? _this.outputEncoding : _currentRenderTarget.texture.encoding;
|
|
|
|
|
|
var materialProperties = properties.get( material );
|
|
|
var lights = currentRenderState.state.lights;
|
|
@@ -25082,7 +25089,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
initMaterial( material, scene, object );
|
|
|
|
|
|
- } else if ( materialProperties.outputEncoding !== _this.outputEncoding ) {
|
|
|
+ } else if ( materialProperties.outputEncoding !== encoding ) {
|
|
|
|
|
|
initMaterial( material, scene, object );
|
|
|
|