Merge pull request #7276 from minggo/v3

fix compiling error
fix effect of spine