|
@@ -75925,7 +75925,7 @@
|
|
|
this.selectModel(object, posInModel);
|
|
|
} else {
|
|
|
//if(!viewer.inputHandler.selection[0]){//正在平移和旋转,不允许取消
|
|
|
- if (this.selected == object && this.transformControls.mode == 'translate') {
|
|
|
+ if (this.selected == object && this.transformControls.object == object && this.transformControls.mode == 'translate') {
|
|
|
this.selectModel(object, posInModel); //update click pos
|
|
|
} else {
|
|
|
this.selectModel(null);
|
|
@@ -82488,7 +82488,7 @@
|
|
|
var transitionRatio2 = 0.8 * delta * 60;
|
|
|
var posePathModels = [];
|
|
|
[this.poseKeys, this.pathKeys /* , this.clipKeys */].forEach(map => {
|
|
|
- map.keys().forEach(model => {
|
|
|
+ Array.from(map.keys()).forEach(model => {
|
|
|
posePathModels.includes(model) || posePathModels.push(model);
|
|
|
});
|
|
|
});
|