Use callback to make adding active skeleton work in 3d
Merge remote-tracking branch 'origin/master'