Normal map samplers are now placed in the correct uniform if present