Fixing sprite and map object texture setting bug
Resolved merge conflict