Two-armed Shanks after he saves Luffy
The meeting between Ace and Shanks does happen in the manga, but according to the One Piece Wiki on Episode 461 where this happens, Shanks having two arms appears to be an error in the animation. 

Personally, I do agree that it was an animation fail, since it was long after Shanks saved Luffy.