Commit 39c32a8d authored by Julius Künzel's avatar Julius Künzel
Browse files

Revert "Fix keyframeview position in mixes"

This reverts commit 0884e247.
parent 0884e247
......@@ -428,7 +428,7 @@ QVariant AssetParameterModel::data(const QModelIndex &index, int role) const
return comment;
}
case InRole:
return pCore->getItemIn(m_ownerId);
return m_asset->get_int("in");
case OutRole:
return m_asset->get_int("out");
case ParentInRole:
......
......@@ -79,7 +79,7 @@ void TransitionStackView::setModel(const std::shared_ptr<AssetParameterModel> &m
connect(m_trackBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTrack(int)));
connect(this, &AssetParameterView::seekToPos, [this](int pos) {
// at this point, the effects returns a pos relative to the clip. We need to convert it to a global time
int clipIn = pCore->getItemPosition(m_model->getOwnerId());
int clipIn = 0;//pCore->getItemPosition(m_model->getOwnerId());
emit seekToTransPos(pos + clipIn);
});
emit initKeyframeView(true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment