Merge branch 'Master_2' into Atlas_3
FUCK YOU GIT!!!!!!!!!!!!!!
try
camera redone
camera
Merge branch 'Atlas_3' into Master_2
resolve conflict
additive soft shader
temp
Merge branch 'Atlas_3' into Master_2