don't include layer effects if they are disabled
Merge branch 'master' into generator-assets