Merge pull request #1317 from aws-lumberyard-dev/Atom/gallowj/stabilization/2106

Atom/gallowj/stabilization/2106

Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material

@@ -14,13 +14,14 @@
         },
         "clearCoat": {
             "enable": true,
-            "normalMap": "EngineAssets/Textures/perlinNoiseNormal_ddn.tif"
+            "normalMap": "EngineAssets/Textures/perlinNoiseNormal_ddn.tif",
+            "normalStrength": 0.10000000149011612
         },
         "general": {
             "applySpecularAA": true
         },
         "metallic": {
-            "factor": 0.5
+            "factor": 0.10000000149011612
         },
         "normal": {
             "factor": 0.05000000074505806,
@@ -31,6 +32,9 @@
         },
         "roughness": {
             "factor": 0.0
+        },
+        "specularF0": {
+            "enableMultiScatterCompensation": true
         }
     }
 }

Gems/AtomContent/gem.json

@@ -8,7 +8,7 @@
         "Gem"
     ],
     "user_tags": [
-        "AtomConent"
+        "AtomContent"
     ],
     "icon_path": "preview.png"
 }

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.wing/DCCsi_7x.wpr

@@ -69,10 +69,16 @@ proj.launch-config = {loc('../../SDK/Atom/Scripts/Python/DCC_Materials/maya_mate
                       loc('../../azpy/__init__.py'): ('custom',
         (u'',
          'launch-oobMrvXFf1SwtYBg')),
+                      loc('../../azpy/constants.py'): ('custom',
+        (u'',
+         'launch-GeaM41WYMGA1sEfm')),
                       loc('../../azpy/env_base.py'): ('project',
         (u'',
          'launch-GeaM41WYMGA1sEfm')),
                       loc('../../azpy/maya/callbacks/node_message_callback_handler.py'): ('c'\
         'ustom',
+        (u'',
+         'launch-GeaM41WYMGA1sEfm')),
+                      loc('../../config.py'): ('custom',
         (u'',
          'launch-GeaM41WYMGA1sEfm'))}

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py

@@ -165,12 +165,14 @@ def get_current_project():
     bootstrap_box = None
 
     try:
-        bootstrap_box = Box.from_json(filename=PATH_USER_O3DE_BOOTSTRAP,
+        bootstrap_box = Box.from_json(filename=str(Path(PATH_USER_O3DE_BOOTSTRAP).resolve()),
                                      encoding="utf-8",
                                      errors="strict",
                                      object_pairs_hook=OrderedDict)
-    except FileExistsError as e:
-        _LOGGER.error('File does not exist: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
+    except Exception as e:
+        # this file runs in py2.7 for Maya 2020, FileExistsError is not defined
+        _LOGGER.error('FileExistsError: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
+        _LOGGER.error('exception is: {}'.format(e))
 
     if bootstrap_box:
         # this seems fairly hard coded - what if the data changes?

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py

@@ -226,7 +226,18 @@ TAG_DEFAULT_PY = str('Launch_pyBASE.bat')
 FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json')
 
 # new o3de related paths
-PATH_USER_O3DE = str('{home}\\{o3de}').format(home=expanduser("~"),
+# os.path.expanduser("~") returns different values in py2.7 vs 3
+PATH_USER_HOME = expanduser("~")
+_LOGGER.debug('user home: {}'.format(PATH_USER_HOME))
+
+# special case, make sure didn't return <user>\documents
+parts = os.path.split(PATH_USER_HOME)
+
+if str(parts[1].lower()) == 'documents':
+    PATH_USER_HOME = parts[0]
+    _LOGGER.debug('user home CORRECTED: {}'.format(PATH_USER_HOME))
+
+PATH_USER_O3DE = str('{home}\\{o3de}').format(home=PATH_USER_HOME,
                                               o3de=TAG_O3DE_FOLDER)
 PATH_USER_O3DE_REGISTRY = str('{0}\\Registry').format(PATH_USER_O3DE)
 PATH_USER_O3DE_BOOTSTRAP = str('{reg}\\{file}').format(reg=PATH_USER_O3DE_REGISTRY,