Updated to CL 22627414:

* docs updates
* authoring fixes
* stress solver crash fixes

1 files changed, 49 insertions, 54 deletions

diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui
index 15d727b..bde4935 100644
--- a/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui
+++ b/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>340</width>
-    <height>311</height>
+    <height>277</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -139,8 +139,21 @@
       <string>Export Assets</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelFBX">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="lineEditObj"/>
+      </item>
+      <item row="2" column="2">
+       <widget class="QCheckBox" name="checkBoxObj">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="lineEditLLAsset"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelLLAsset">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -160,18 +173,22 @@
          </size>
         </property>
         <property name="text">
-         <string>FBX</string>
+         <string>LLAsset</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="lineEditCollision"/>
+      <item row="0" column="2">
+       <widget class="QCheckBox" name="checkBoxFBX">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="labelCollision">
+       <widget class="QLabel" name="labelObj">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -191,21 +208,18 @@
          </size>
         </property>
         <property name="text">
-         <string>Collision</string>
+         <string>Obj</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="lineEditObj"/>
-      </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="lineEditFBX"/>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelObj">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelFBX">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -225,36 +239,22 @@
          </size>
         </property>
         <property name="text">
-         <string>Obj</string>
+         <string>FBX</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="checkBoxFBX">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QCheckBox" name="checkBoxObj">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="checkBoxCollision">
+      <item row="3" column="2">
+       <widget class="QCheckBox" name="checkBoxLLAsset">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelLLAsset">
+      <item row="4" column="0">
+       <widget class="QLabel" name="labelTKAsset">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -274,25 +274,25 @@
          </size>
         </property>
         <property name="text">
-         <string>LLAsset</string>
+         <string>TKAsset</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="lineEditLLAsset"/>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="lineEditTKAsset"/>
       </item>
-      <item row="3" column="2">
-       <widget class="QCheckBox" name="checkBoxLLAsset">
+      <item row="4" column="2">
+       <widget class="QCheckBox" name="checkBoxTKAsset">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="labelTKAsset">
+      <item row="5" column="0">
+       <widget class="QLabel" name="labelBPXA">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -312,25 +312,25 @@
          </size>
         </property>
         <property name="text">
-         <string>TKAsset</string>
+         <string>BPXA</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="lineEditTKAsset"/>
+      <item row="5" column="1">
+       <widget class="QLineEdit" name="lineEditBPXA"/>
       </item>
-      <item row="4" column="2">
-       <widget class="QCheckBox" name="checkBoxTKAsset">
+      <item row="5" column="2">
+       <widget class="QCheckBox" name="checkBoxBPXA">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="labelBPXA">
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelEmbedFBXCollision">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -350,18 +350,15 @@
          </size>
         </property>
         <property name="text">
-         <string>BPXA</string>
+         <string>Embed collision in FBX</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="lineEditBPXA"/>
-      </item>
-      <item row="5" column="2">
-       <widget class="QCheckBox" name="checkBoxBPXA">
+      <item row="1" column="2">
+       <widget class="QCheckBox" name="checkBoxEmbedFBXCollision">
         <property name="text">
          <string/>
         </property>
@@ -410,8 +407,6 @@
   <tabstop>checkBoxFBX</tabstop>
   <tabstop>lineEditObj</tabstop>
   <tabstop>checkBoxObj</tabstop>
-  <tabstop>lineEditCollision</tabstop>
-  <tabstop>checkBoxCollision</tabstop>
   <tabstop>lineEditLLAsset</tabstop>
   <tabstop>checkBoxLLAsset</tabstop>
   <tabstop>lineEditTKAsset</tabstop>