bvh update
Merge remote-tracking branch 'origin/master'
bvh update: fixed drawable selection