24ba3ae1f6
# Conflicts: # resources/Schema/Components/PointLight.xsd # resources/Shaders/ForwardPlus.frag.glsl
# Conflicts: # resources/Schema/Components/PointLight.xsd # resources/Shaders/ForwardPlus.frag.glsl