Merge branch '1904'

Authored by mardelle on May 21 2019, 11:25 AM.

Description

Merge branch '1904'

Merged Changes

CommitAuthorDetailsCommitted
f37c1d8e023emardelle
Fix custom effect appearing with wrong name after save Related to #188 
May 21 2019
77ac9a0011d0mardelle
Use rounder rect icon instead of placeholder folder icon for custom effects 
May 21 2019
746678983cccmardelle
Correctly hide/show asset settings when deselected/reselected 
May 21 2019