|
@@ -537,7 +537,12 @@ let MergeEditor = {
|
|
|
if(this.selected == model) this.selectModel(null)
|
|
if(this.selected == model) this.selectModel(null)
|
|
|
let dispose = (e)=>{
|
|
let dispose = (e)=>{
|
|
|
e.geometry && e.geometry.dispose()
|
|
e.geometry && e.geometry.dispose()
|
|
|
- e.material && e.material.dispose()
|
|
|
|
|
|
|
+ if(e.material){
|
|
|
|
|
+ let mats = (e.material instanceof Array) ? e.material : [e.material]
|
|
|
|
|
+ mats.forEach(mat =>{
|
|
|
|
|
+ mat.dispose()
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
model.skeletonHelper && model.add(model.skeletonHelper ) //打包一起dispose
|
|
model.skeletonHelper && model.add(model.skeletonHelper ) //打包一起dispose
|