Merge branch 'master' into develop
point light option added
point light reduces as inverse square
added #include functionality to shader import to make code DRYer
more normal slicing!
update version to v1.12
Merge branch 'develop' to v1.12