UNI-42752 code review fixes

- change rootDummyName
- move dummy creation/setting into afterImport()

Author: vkovec

Assets/Integrations/Autodesk/max/scripts/UnityFbxForMaxPlugin.ms

@@ -3,10 +3,56 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
 (
     origObjects = #()
     currSetName = ""
-    rootDummyName = "UnityFbxRootDummy"
+    rootDummyName = "UnityFbxExportSets"
+    unityFbxFilePathAttr = ""
+    unityFbxFileNameAttr = ""
+    unityAnimFileNameAttr = ""
+    unityAnimFilePathAttr = ""
+    isAnimFile = false
 
     persistent global unityAskSetUnits
 
+    fn getOrCreateDummy name = (
+        unityDummy = getNodeByName (name)
+        if (unityDummy == undefined) do (
+            unityDummy = Dummy()
+            unityDummy.name = name
+            unityDummy.boxsize = [1,1,1]
+        )
+        unityDummy -- return dummy
+    )
+    
+    fn getOrCreateRootDummy = (
+        getOrCreateDummy rootDummyName
+    )
+    
+    fn getOrCreateSettingsDummy name = (
+        unityDummy = getOrCreateDummy name
+        
+        if not (isProperty unityDummy "modelFilePath") do (
+            unitySetData = attributes unityData
+            (
+                parameters main rollout:params
+                (
+                    modelFilePath type: #string ui:filep default:""
+                    modelFileName type: #string ui:filen default:""
+                    animFilePath type: #string ui:afilep default:""
+                    animFileName type: #string ui:afilen default:""
+                )
+                rollout params "Unity Export Parameters"
+                ( 
+                    edittext filep "Model File Path:" text:modelFilePath readOnly:false labelOnTop:true
+                    edittext filen "Model File Name:" text:modelFileName readOnly:false labelOnTop:true
+                    edittext afilep "Animation File Path:" text:animFilePath readOnly:false labelOnTop:true
+                    edittext afilen "Animation File Name:" text:animFileName readOnly:false labelOnTop:true
+                 )
+            )
+            custAttributes.add unityDummy unitySetData
+        )
+        
+        unityDummy -- return dummy
+    )
+    
     global afterImport
     fn afterImport = (
         unityFbxExportSet = #()
@@ -21,6 +67,21 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
             )
         )
         selectionSets[currSetName] = unityFbxExportSet
+        
+        -- check if dummy already exists in scene
+        unityDummy = getOrCreateSettingsDummy currSetName
+        
+        if((not isAnimFile) or unityDummy.unityData.modelFilePath == "") do (
+            unityDummy.unityData.modelFilePath = unityFbxFilePathAttr
+        )
+        if((not isAnimFile) or unityDummy.unityData.modelFileName == "") do (
+            unityDummy.unityData.modelFileName = unityFbxFileNameAttr
+        )
+        unityDummy.unityData.animFilePath = unityAnimFilePathAttr
+        unityDummy.unityData.animFileName = unityAnimFileNameAttr
+        
+        unityRootDummy = getOrCreateRootDummy()
+        unityDummy.parent = unityRootDummy
     );
 
     fn loadUnityFbxImportSettings = (
@@ -50,46 +111,6 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
             undefined
     )
 
-    fn getOrCreateDummy name = (
-        unityDummy = getNodeByName (name)
-        if (unityDummy == undefined) do (
-            unityDummy = Dummy()
-            unityDummy.name = name
-            unityDummy.boxsize = [1,1,1]
-        )
-        unityDummy -- return dummy
-    )
-    
-    fn getOrCreateRootDummy = (
-        getOrCreateDummy rootDummyName
-    )
-    
-    fn getOrCreateSettingsDummy name = (
-        unityDummy = getOrCreateDummy name
-        
-        if not (isProperty unityDummy "modelFilePath") do (
-            unitySetData = attributes unityData
-            (
-                parameters main rollout:params
-                (
-                    modelFilePath type: #string ui:filep default:""
-                    modelFileName type: #string ui:filen default:""
-                    animFilePath type: #string ui:afilep default:""
-                    animFileName type: #string ui:afilen default:""
-                )
-                rollout params "Unity Export Parameters"
-                ( 
-                    edittext filep "Model File Path:" text:modelFilePath readOnly:false labelOnTop:true
-                    edittext filen "Model File Name:" text:modelFileName readOnly:false labelOnTop:true
-                    edittext afilep "Animation File Path:" text:animFilePath readOnly:false labelOnTop:true
-                    edittext afilen "Animation File Name:" text:animFileName readOnly:false labelOnTop:true
-                 )
-            )
-            custAttributes.add unityDummy unitySetData
-        )
-        unityDummy -- return dummy
-    )
-    
     -- Make sure the FbxImporter plugin is loaded
     pluginManager.loadClass FbxImporter
 
@@ -119,17 +140,17 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
             )
         )
 
-        local unityFbxFilePathAttr = ""
+        unityFbxFilePathAttr = ""
         for fbxFileName in fbxFileNames do (
             -- Get all objects in scene before importAction
             origObjects = objects as array
 
             unityFbxFilePathAttr = getFilenamePath fbxFileName
-            local unityFbxFileNameAttr = filenameFromPath fbxFileName
-            local unityFbxFileName = getFilenameFile fbxFileName
+            unityFbxFileNameAttr = filenameFromPath fbxFileName
+            unityFbxFileName = getFilenameFile fbxFileName
 
-            local unityAnimFilePathAttr = unityFbxFilePathAttr
-            local unityAnimFileNameAttr = unityFbxFileNameAttr
+            unityAnimFilePathAttr = unityFbxFilePathAttr
+            unityAnimFileNameAttr = unityFbxFileNameAttr
 
             -- check if importing an animation file (contains @ symbol)
             local isAnimFile = false
@@ -144,22 +165,6 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
 
             importFile fbxFileName #noPrompt using:FBXIMP
 
-            -- check if dummy already exists in scene
-            currSetName = unityFbxFileName + "_UnityExportSet"
-            unityDummy = getOrCreateSettingsDummy currSetName
-            
-            if((not isAnimFile) or unityDummy.unityData.modelFilePath == "") do (
-                unityDummy.unityData.modelFilePath = unityFbxFilePathAttr
-            )
-            if((not isAnimFile) or unityDummy.unityData.modelFileName == "") do (
-                unityDummy.unityData.modelFileName = unityFbxFileNameAttr
-            )
-            unityDummy.unityData.animFilePath = unityAnimFilePathAttr
-            unityDummy.unityData.animFileName = unityAnimFileNameAttr
-            
-            unityRootDummy = getOrCreateRootDummy()
-            unityDummy.parent = unityRootDummy
-            
             callbacks.removeScripts #postImport id:#unityPlugin
         )