From 8a59eb0067a0d450226a7950f7155c83a3074fb7 Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Mon, 19 Aug 2019 11:15:09 +0800 Subject: [PATCH] fix(merge):fix conflict --- src/layer/tile/vector_tile_mesh.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer/tile/vector_tile_mesh.js b/src/layer/tile/vector_tile_mesh.js index 2307b2b206..afb66aaf33 100644 --- a/src/layer/tile/vector_tile_mesh.js +++ b/src/layer/tile/vector_tile_mesh.js @@ -37,7 +37,7 @@ export default class VectorTileMesh { this.mesh = getRender(this.layer.get('type'), data.shape)(null, this.layer, data.buffer); if (this.mesh.type !== 'composer') { // 热力图的情况 this.mesh.onBeforeRender = renderer => { - // this._renderMask(renderer); + this._renderMask(renderer); const zoom = this.layer.scene.getZoom(); updateObjecteUniform(this._object3D, { u_time: this.layer.scene._engine.clock.getElapsedTime(),