fixed selection update while merging, fixed bug causing error because skeleton viewport was used for color picking