Artist director of Glasgow School of Art, who championed the ‘Glasgow style’ and the work of Charles Rennie Mackintosh