Skip to content

Commit 36fee8a

Browse files
committed
UNI-4964: Cleaned up leftover merge artifacts
1 parent d33bdae commit 36fee8a

File tree

6 files changed

+2
-129
lines changed

6 files changed

+2
-129
lines changed

com.unity.formats.fbx/Documentation~/exporting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ In addition, it also exports the following animated attributes:
201201

202202
When exporting an FBX file, the following Export Options window opens, displaying options for specifying what gets exported.
203203

204-
![Export Options window](images/FBXExporter_ExportOptionsWindow.png)
204+
![Export Options window](images/FBXExporter_ConvertOptionsWindow.png)
205205

206206

207207
### Export Options Properties
15 KB
Loading
13.8 KB
Loading

com.unity.formats.fbx/Documentation~/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The Unity Integration for Autodesk® 3ds Max® feature supports the following ve
3434

3535
To install this package, follow the instructions in the [Package Manager documentation](https://docs.unity3d.com/Manual/upm-ui-install.html).
3636

37-
Verify that the FBX Exporter is correctly installed by opening it (from the top menu: **GameObject** > **Export To FBX...**).
37+
Verify that the FBX Exporter is correctly installed by opening it (from the top menu: **GameObject** > **Export To FBX**).
3838

3939
### Updating from 1.3.0f1 or earlier
4040

com.unity.formats.fbx/Documentation~/nested-prefabs.md

Lines changed: 0 additions & 101 deletions
This file was deleted.

com.unity.formats.fbx/Documentation~/prefabs-overview.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)