Merge branch '1912'

Authored by mardelle on Nov 13 2019, 4:44 PM.

Description

Merge branch '1912'

Merged Changes

CommitAuthorDetailsCommitted
5d6f44a2fbb1mardelle
Minor optimizations 
Nov 13 2019
904824ccd8ccmardelle
Fix dragging favorite effect to master Fix master effectstack keyframe seeking 
Nov 13 2019