Merge pull request #3542 from omma2289/develop

Fixed watermark function to work without drop shadow

Close #3536 
Close #3539