[DF-185] In-scene object selection now always works
[DF-185] Fixed memory leak