razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix editability of level under mesh stop frame

Browse source
This commit is contained in:
manongjohn 2022-01-23 11:59:17 -05:00
parent ad13891feb
commit f38aa3e970
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/tnztools/rasterselection.cpp
View file

@ -1347,9 +1347,11 @@ bool RasterSelection::isEditable() {
// Test for Mesh-deformed levels
const TStageObjectId &parentId = obj->getParent();
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
TXshSimpleLevel *parentSl =
xsh->getCell(rowIndex, parentId.getIndex()).getSimpleLevel();
if (parentSl && parentSl->getType() == MESH_XSHLEVEL) return false;
TXshCell cell = xsh->getCell(rowIndex, parentId.getIndex());
TXshSimpleLevel *parentSl = cell.getSimpleLevel();
if (!cell.getFrameId().isStopFrame() && parentSl &&
parentSl->getType() == MESH_XSHLEVEL)
return false;
}
}

8
toonz/sources/tnztools/strokeselection.cpp
View file

@ -786,9 +786,11 @@ bool StrokeSelection::isEditable() {
// Test for Mesh-deformed levels
const TStageObjectId &parentId = obj->getParent();
if (parentId.isColumn() && obj->getParentHandle()[0] != 'H') {
TXshSimpleLevel *parentSl =
xsh->getCell(rowIndex, parentId.getIndex()).getSimpleLevel();
if (parentSl && parentSl->getType() == MESH_XSHLEVEL) return false;
TXshCell cell = xsh->getCell(rowIndex, parentId.getIndex());
TXshSimpleLevel *parentSl = cell.getSimpleLevel();
if (!cell.getFrameId().isStopFrame() && parentSl &&
parentSl->getType() == MESH_XSHLEVEL)
return false;
}
}