Fixed threading issue pointed out by unknownbrackets and made texture scaling changes apply immediately
Merge pull request #1608 from PeterTh/master

Threading fix for texture scaling, make option immediate (mk. 2)