[DF-3732] small refactor
[DF-185] Fix mac os project
Merge branch 'tree_animation' into trees_lighting