From f8fe9d44532009ad9f9d9f7d97ca19fa04e71757 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 19 Aug 2018 10:56:00 +0200 Subject: [PATCH] MSVC does not support keyword 'or' --- src/Mod/Import/App/AppImportPy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp index e8de436aa8..16d8071497 100644 --- a/src/Mod/Import/App/AppImportPy.cpp +++ b/src/Mod/Import/App/AppImportPy.cpp @@ -402,7 +402,7 @@ private: layerName = "none"; PyMem_Free(fname); - if ((versionParm == 12) or + if ((versionParm == 12) || (versionParm == 14)) { versionOverride = true; } @@ -451,7 +451,7 @@ private: layerName = "none"; PyMem_Free(fname); - if ((versionParm == 12) or + if ((versionParm == 12) || (versionParm == 14)) { versionOverride = true; } @@ -513,7 +513,7 @@ private: layerName = "none"; PyMem_Free(fname); - if ((versionParm == 12) or + if ((versionParm == 12) || (versionParm == 14)) { versionOverride = true; } @@ -566,7 +566,7 @@ private: layerName = "none"; PyMem_Free(fname); - if ((versionParm == 12) or + if ((versionParm == 12) || (versionParm == 14)) { versionOverride = true; }