Masking axis for rotation in CRotationPoint
Merge remote-tracking branch 'origin/editor'