Merge "Finishing light linking." into graphics-dev