Merged branch 'master' from opentoonz w/ conflicts resolved

Author: manongjohn

.travis.yml

@@ -23,7 +23,7 @@ matrix:
         - os: linux
           compiler: clang
         - os: osx
-          osx_image: xcode8.3
+          osx_image: xcode10.1
 
 before_deploy:
   # Set up git user name and tag this commit

ci-scripts/osx/travis-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 pushd thirdparty/tiff-4.0.3
-./configure && make
+./configure --disable-lzma && make
 popd
 cd toonz && mkdir build && cd build
 QTVERSION=`ls /usr/local/Cellar/qt`

stuff/config/loc/한국어/colorfx.qm

@@ -357,7 +357,7 @@ TOStream &TOStream::operator<<(string v) {
     if ((!iswalnum(v[i]) && v[i] != '_' && v[i] != '%') ||
         v[i] < 32      // Less than ASCII for SPACE
         || v[i] > 126  // Greater than ASCII for ~
-    )
+        )
       break;
   if (i == len)
     os << v << " ";
@@ -386,7 +386,7 @@ TOStream &TOStream::operator<<(QString _v) {
     if ((!iswalnum(v[i]) && v[i] != '_' && v[i] != '%') ||
         v[i] < 32      // Less than ASCII for SPACE
         || v[i] > 126  // Greater than ASCII for ~
-    )
+        )
       break;
   if (i == len)
     os << v << " ";
@@ -1078,9 +1078,15 @@ TIStream &TIStream::operator>>(TFilePath &v) {
   is.get(c);
   if (c == '"') {
     is.get(c);
-    while (is && c != '"') {
+    bool escapeChar = false;
+    // If processing double-quote ("), if it's escaped, keep reading.
+    while (is && (c != '"' || escapeChar)) {
       // if(c=='\\')
       //   is.get(c);
+      if (c == '\\' && !escapeChar)
+        escapeChar = true;
+      else
+        escapeChar = false;
       s.append(1, c);
       is.get(c);
     }