Merge branch '1904'

Authored by mardelle on Jun 21 2019, 12:10 PM.

Description

Merge branch '1904'

Details

Committed
mardelleJun 21 2019, 12:10 PM
Parents
R158:487ce84fb95a: Fix tests
R158:cb6a6efbe492: Merge branch '1904'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
487ce84fb95amardelle
Fix tests 
Jun 21 2019
c97b7fdfbf5dmardelle
Effectstack: don't display keyframes that are outside of clip 
Jun 21 2019
9a8de2e400a3mardelle
Cleanup in clip/composition resize UI update 
Jun 21 2019
c415348425b6mardelle
Fix thread/cache count causing concurrency crashes. Fixes #265 
Jun 21 2019
8f533d9c94f1mardelle
don't trigger unnecessary refresh on clip resize 
Jun 18 2019