Fix editability of level under mesh stop frame
This commit is contained in:
parent
ad13891feb
commit
f38aa3e970
2 changed files with 10 additions and 6 deletions
|
@ -1347,9 +1347,11 @@ bool RasterSelection::isEditable() {
|
||||||
// Test for Mesh-deformed levels
|
// Test for Mesh-deformed levels
|
||||||
const TStageObjectId &parentId = obj->getParent();
|
const TStageObjectId &parentId = obj->getParent();
|
||||||
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
|
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
|
||||||
TXshSimpleLevel *parentSl =
|
TXshCell cell = xsh->getCell(rowIndex, parentId.getIndex());
|
||||||
xsh->getCell(rowIndex, parentId.getIndex()).getSimpleLevel();
|
TXshSimpleLevel *parentSl = cell.getSimpleLevel();
|
||||||
if (parentSl && parentSl->getType() == MESH_XSHLEVEL) return false;
|
if (!cell.getFrameId().isStopFrame() && parentSl &&
|
||||||
|
parentSl->getType() == MESH_XSHLEVEL)
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -786,9 +786,11 @@ bool StrokeSelection::isEditable() {
|
||||||
// Test for Mesh-deformed levels
|
// Test for Mesh-deformed levels
|
||||||
const TStageObjectId &parentId = obj->getParent();
|
const TStageObjectId &parentId = obj->getParent();
|
||||||
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
|
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
|
||||||
TXshSimpleLevel *parentSl =
|
TXshCell cell = xsh->getCell(rowIndex, parentId.getIndex());
|
||||||
xsh->getCell(rowIndex, parentId.getIndex()).getSimpleLevel();
|
TXshSimpleLevel *parentSl = cell.getSimpleLevel();
|
||||||
if (parentSl && parentSl->getType() == MESH_XSHLEVEL) return false;
|
if (!cell.getFrameId().isStopFrame() && parentSl &&
|
||||||
|
parentSl->getType() == MESH_XSHLEVEL)
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue