openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Protect against linking the tracked object with the parent clip

Browse Source
This commit is contained in:
Brenno
2021-03-18 13:05:21 -03:00
parent 7272ff0928
commit 3729188f18
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TrackedObjectBBox.cpp
View File

@@ -378,9 +378,15 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
if (!root["protobuf_data_path"].isNull())
protobufDataPath = root["protobuf_data_path"].asString();
// Set the id of the child clio
if (!root["child_clip_id"].isNull())
ChildClipId(root["child_clip_id"].asString());
// Set the id of the child clip
// Does not allow to link to the parent clip
if (!root["child_clip_id"].isNull()){
Clip* parentClip = (Clip *) ParentClip();
if(parentClip && (root["child_clip_id"].asString() != parentClip->Id())){
ChildClipId(root["child_clip_id"].asString());
}
}
// Set the Keyframes by the given JSON object
if (!root["delta_x"].isNull())