Merge branch 'scripts-cleanup' into master

daz3d · Dec 22, 2021 · 3f38ce2 · 3f38ce2
2 parents 61ca54a + daa93cb
commit 3f38ce2
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa
@@ -12,18 +12,18 @@ if( g_sScriptPath === "" ){
 g_oFileInfo.deleteLater();
 
 // Global Includes
-var g_sBridgeHelpers = String( "%2/dzBridgeUtils/Dz%1Helpers.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeEnv = String( "%2/dzBridgeUtils/Dz%1Environment.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeScene = String( "%2/dzBridgeUtils/Dz%1Scene.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgePose = String( "%2/dzBridgeUtils/Dz%1Morphs.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeMorphs = String( "%2/dzBridgeUtils/Dz%1Pose.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeAutoWeight = String( "%2/dzBridgeUtils/Dz%1AutoWeight.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeExporter = String( "%2/dzBridgeUtils/Dz%1BridgeExporter.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeDialog = String( "%2/dzBridgeUtils/Dz%1Dialog.dsa" ).arg( g_sBridge ).arg( g_sScriptPath )
-var g_sBridgeWriter = String( "%2/dzBridgeUtils/Dz%1Writer.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeFigure = String( "%2/dzBridgeUtils/Dz%1Figure.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeSubdiv = String( "%2/dzBridgeUtils/Dz%1Subdivision.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
-var g_sBridgeDforce = String( "%2/dzBridgeUtils/Dz%1Dforce.dsa" ).arg( g_sBridge ).arg( g_sScriptPath );
+var g_sBridgeHelpers = String( "%1/dzBridgeUtils/Helpers.dsa" ).arg( g_sScriptPath );
+var g_sBridgeEnv = String( "%1/dzBridgeUtils/Environment.dsa" ).arg( g_sScriptPath );
+var g_sBridgeScene = String( "%1/dzBridgeUtils/Scene.dsa" ).arg( g_sScriptPath );
+var g_sBridgePose = String( "%1/dzBridgeUtils/Morphs.dsa" ).arg( g_sScriptPath );
+var g_sBridgeMorphs = String( "%1/dzBridgeUtils/Pose.dsa" ).arg( g_sScriptPath );
+var g_sBridgeAutoWeight = String( "%1/dzBridgeUtils/AutoWeight.dsa" ).arg( g_sScriptPath );
+var g_sBridgeExporter = String( "%1/dzBridgeUtils/Exporter.dsa" ).arg( g_sScriptPath );
+var g_sBridgeDialog = String( "%1/dzBridgeUtils/Dialog.dsa" ).arg( g_sScriptPath )
+var g_sBridgeWriter = String( "%1/dzBridgeUtils/Writer.dsa" ).arg( g_sScriptPath );
+var g_sBridgeFigure = String( "%1/dzBridgeUtils/Figure.dsa" ).arg( g_sScriptPath );
+var g_sBridgeSubdiv = String( "%1/dzBridgeUtils/Subdivision.dsa" ).arg( g_sScriptPath );
+var g_sBridgeDforce = String( "%1/dzBridgeUtils/Dforce.dsa" ).arg( g_sScriptPath );
 
 include( g_sBridgeHelpers ); // Dependencies : ...
 include( g_sBridgeDforce ); // Dependencies : ...

diff --git a/...Bridge/dzBridgeUtils/DzO3DEAutoWeight.dsa → ...Z/o3deBridge/dzBridgeUtils/AutoWeight.dsa b/...Bridge/dzBridgeUtils/DzO3DEAutoWeight.dsa → ...Z/o3deBridge/dzBridgeUtils/AutoWeight.dsa
diff --git a/...o3deBridge/dzBridgeUtils/DzO3DEDforce.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Dforce.dsa b/...o3deBridge/dzBridgeUtils/DzO3DEDforce.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Dforce.dsa
diff --git a/...o3deBridge/dzBridgeUtils/DzO3DEDialog.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Dialog.dsa b/...o3deBridge/dzBridgeUtils/DzO3DEDialog.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Dialog.dsa
@@ -1,5 +1,4 @@
 
-var g_sBridge = "O3DE"
 /** 
 * Contains the Dialogs for the User to Control
 * @class
@@ -28,8 +27,8 @@ function DzBridgeDialog( oBridgeExporter )
 		this.bAutoWeights;
 		this.bNewSubdiv;
 
-        this.sMorphDialog = String( "/dzBridgeUtils/Dz%1MorphSelectionDialog" ).arg( g_sBridge )
-	    this.sSubdivDialog = String( "/dzBridgeUtils/Dz%1SubdivisionDialog" ).arg( g_sBridge )
+        this.sMorphDialog = String( "/dzBridgeUtils/MorphSelectionDialog" )
+	    this.sSubdivDialog = String( "/dzBridgeUtils/SubdivisionDialog" )
         this.sPresetPath = oBridgeExporter.sPresetPath;
 
         this.aExportableProperties = [];

diff --git a/...ridge/dzBridgeUtils/DzO3DEEnvironment.dsa → .../o3deBridge/dzBridgeUtils/Environment.dsa b/...ridge/dzBridgeUtils/DzO3DEEnvironment.dsa → .../o3deBridge/dzBridgeUtils/Environment.dsa
diff --git a/...ge/dzBridgeUtils/DzO3DEBridgeExporter.dsa → ...DAZ/o3deBridge/dzBridgeUtils/Exporter.dsa b/...ge/dzBridgeUtils/DzO3DEBridgeExporter.dsa → ...DAZ/o3deBridge/dzBridgeUtils/Exporter.dsa
diff --git a/...o3deBridge/dzBridgeUtils/DzO3DEFigure.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Figure.dsa b/...o3deBridge/dzBridgeUtils/DzO3DEFigure.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Figure.dsa
diff --git a/...3deBridge/dzBridgeUtils/DzO3DEHelpers.dsa → .../DAZ/o3deBridge/dzBridgeUtils/Helpers.dsa b/...3deBridge/dzBridgeUtils/DzO3DEHelpers.dsa → .../DAZ/o3deBridge/dzBridgeUtils/Helpers.dsa
diff --git a/...ridgeUtils/DzO3DEMorphSelectionDialog.dsa → ...ge/dzBridgeUtils/MorphSelectionDialog.dsa b/...ridgeUtils/DzO3DEMorphSelectionDialog.dsa → ...ge/dzBridgeUtils/MorphSelectionDialog.dsa
diff --git a/...o3deBridge/dzBridgeUtils/DzO3DEMorphs.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Morphs.dsa b/...o3deBridge/dzBridgeUtils/DzO3DEMorphs.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Morphs.dsa
diff --git a/...Z/o3deBridge/dzBridgeUtils/DzO3DEPose.dsa → ...ort/DAZ/o3deBridge/dzBridgeUtils/Pose.dsa b/...Z/o3deBridge/dzBridgeUtils/DzO3DEPose.dsa → ...ort/DAZ/o3deBridge/dzBridgeUtils/Pose.dsa
diff --git a/.../o3deBridge/dzBridgeUtils/DzO3DEScene.dsa → ...rt/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa b/.../o3deBridge/dzBridgeUtils/DzO3DEScene.dsa → ...rt/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa
@@ -30,7 +30,7 @@ DzBridgeScene.superclass = DzBridgeHelpers.prototype;
 			"bIncludeSubdiv" : false,
 			"bIncludeAnim" : false,
 			"bIncludeMorphs" : false,
-			"bCollectTextures" : false,
+			"bCollectTextures" : true,
 			"bRemoveIncompatible" : false,
 			"bAutoWeights" : false,
 			"bNewSubdiv" : false,

diff --git a/...ridge/dzBridgeUtils/DzO3DESubdivision.dsa → .../o3deBridge/dzBridgeUtils/Subdivision.dsa b/...ridge/dzBridgeUtils/DzO3DESubdivision.dsa → .../o3deBridge/dzBridgeUtils/Subdivision.dsa
diff --git a/...dzBridgeUtils/DzO3DESubdivisionDialog.dsa → ...ridge/dzBridgeUtils/SubdivisionDialog.dsa b/...dzBridgeUtils/DzO3DESubdivisionDialog.dsa → ...ridge/dzBridgeUtils/SubdivisionDialog.dsa
diff --git a/...o3deBridge/dzBridgeUtils/DzO3DEWriter.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Writer.dsa b/...o3deBridge/dzBridgeUtils/DzO3DEWriter.dsa → ...t/DAZ/o3deBridge/dzBridgeUtils/Writer.dsa