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

Include Camera Column in Insert and Delete Scene Frames

Browse source
This commit is contained in:
manongjohn 2019-08-09 23:36:29 -04:00
parent b4eed55ce9
commit 53a5c4867f
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
toonz/sources/toonz/xsheetcmd.cpp
View file

@ -161,19 +161,16 @@ void InsertSceneFrameUndo::doInsertSceneFrame(int frame) {
for (c = -1; c < colsCount; ++c) {
TStageObjectId objectId;
if (c == -1) {
#ifdef LINETEST
if (c == -1)
objectId = TStageObjectId::CameraId(xsh->getCameraColumnIndex());
#else
continue;
#endif
} else
else {
objectId = TStageObjectId::ColumnId(c);
xsh->insertCells(frame, c);
xsh->setCell(frame, c, xsh->getCell(frame + 1, c));
xsh->insertCells(frame, c);
xsh->setCell(frame, c, xsh->getCell(frame + 1, c));
if (!xsh->getColumn(c) || xsh->getColumn(c)->isLocked()) continue;
if (!xsh->getColumn(c) || xsh->getColumn(c)->isLocked()) continue;
}
if (TStageObject *obj = xsh->getStageObject(objectId))
insertFrame(obj, frame);
@ -188,18 +185,15 @@ void InsertSceneFrameUndo::doRemoveSceneFrame(int frame) {
for (int c = -1; c != xsh->getColumnCount(); ++c) {
TStageObjectId objectId;
if (c == -1) {
#ifdef LINETEST
if (c == -1)
objectId = TStageObjectId::CameraId(xsh->getCameraColumnIndex());
#else
continue;
#endif
} else
else {
objectId = TStageObjectId::ColumnId(c);
xsh->removeCells(frame, c);
xsh->removeCells(frame, c);
if (!xsh->getColumn(c) || xsh->getColumn(c)->isLocked()) continue;
if (!xsh->getColumn(c) || xsh->getColumn(c)->isLocked()) continue;
}
if (TStageObject *pegbar = xsh->getStageObject(objectId))
removeFrame(pegbar, frame);