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

Merge pull request #3336 from shun-iwasawa/fix_pegbar_lost_on_exploding_subxsheet

Browse source 
Fix pegbar lost on exploding sub xsheet
This commit is contained in:
Rodney 2020-06-09 17:01:26 -05:00 committed by GitHub
commit e6e7686e88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
toonz/sources/toonz/subscenecommand.cpp
View file

@ -538,6 +538,11 @@ void bringObjectOut(TStageObject *obj, TXsheet *xsh,
assert(id.isPegbar());
pegbarIndex++;
TStageObjectId outerId = TStageObjectId::PegbarId(pegbarIndex);
// find the first available pegbar id
while (xsh->getStageObjectTree()->getStageObject(outerId, false)) {
pegbarIndex++;
outerId = TStageObjectId::PegbarId(pegbarIndex);
}
TStageObject *outerObj =
xsh->getStageObjectTree()->getStageObject(outerId, true);
outerObj->setDagNodePos((*it)->getDagNodePos());
@ -600,8 +605,8 @@ set<int> explodeStageObjects(
if (!onlyColumn) {
// add a pegbar to represent the table
TStageObject *table = subXsh->getStageObject(TStageObjectId::TableId);
/*- 空いてるIndexまでpegbarIndexを進める -*/
int pegbarIndex = 2;
// find the first available pegbar index
int pegbarIndex = 0;
while (
outerTree->getStageObject(TStageObjectId::PegbarId(pegbarIndex), false))
pegbarIndex++;