From f38aa3e9703cc1ef74d0117847f43c90b7a18f01 Mon Sep 17 00:00:00 2001 From: manongjohn Date: Sun, 23 Jan 2022 11:59:17 -0500 Subject: [PATCH] Fix editability of level under mesh stop frame --- toonz/sources/tnztools/rasterselection.cpp | 8 +++++--- toonz/sources/tnztools/strokeselection.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/toonz/sources/tnztools/rasterselection.cpp b/toonz/sources/tnztools/rasterselection.cpp index 6afcb5c0..33203af5 100644 --- a/toonz/sources/tnztools/rasterselection.cpp +++ b/toonz/sources/tnztools/rasterselection.cpp @@ -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; } } diff --git a/toonz/sources/tnztools/strokeselection.cpp b/toonz/sources/tnztools/strokeselection.cpp index a051decc..5a08db46 100644 --- a/toonz/sources/tnztools/strokeselection.cpp +++ b/toonz/sources/tnztools/strokeselection.cpp @@ -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; } }