Skip to content

Commit d6450e6

Browse files
authored
Merge pull request #519 from Unity-Technologies/v3.2.0-preview
V3.2.0 preview
2 parents 8fe16c7 + f378069 commit d6450e6

15 files changed

+948
-295
lines changed

.yamato/promotion.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# tests.
77
#
88
test_editors:
9-
- version: 2019.1
9+
- version: 2019.3
1010
test_platforms:
1111
- name: win
1212
type: Unity::VM
@@ -24,7 +24,7 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
2424
variables:
2525
UPMCI_PROMOTION: 1
2626
commands:
27-
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
27+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2828
- upm-ci package test --unity-version {{ editor.version }} --package-path com.unity.formats.fbx
2929
artifacts:
3030
logs:
@@ -38,26 +38,6 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
3838
{% endfor %}
3939
{% endfor %}
4040

41-
promotion_test_trigger:
42-
name: Promotion Tests Trigger
43-
agent:
44-
type: Unity::VM
45-
image: package-ci/win10:stable
46-
flavor: b1.small
47-
artifacts:
48-
logs:
49-
paths:
50-
- "upm-ci~/test-results/**/*"
51-
packages:
52-
paths:
53-
- "upm-ci~/packages/**/*"
54-
dependencies:
55-
{% for editor in test_editors %}
56-
{% for platform in test_platforms %}
57-
- .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
58-
{% endfor %}
59-
{% endfor %}
60-
6141
promote:
6242
name: Promote to Production
6343
agent:
@@ -67,7 +47,7 @@ promote:
6747
variables:
6848
UPMCI_PROMOTION: 1
6949
commands:
70-
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
50+
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
7151
- upm-ci package promote --package-path com.unity.formats.fbx
7252
triggers:
7353
tags:

.yamato/upm-ci.yml

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
editors:
1+
test_trigger_editors:
2+
- version: 2018.4
3+
- version: 2019.3
4+
publish_trigger_editors:
25
- version: 2018.3
36
- version: 2018.4
47
- version: 2019.1
58
- version: 2019.2
9+
- version: 2019.3
10+
- version: 2020.1
611
platforms:
712
- name: win
813
type: Unity::VM
@@ -21,15 +26,15 @@ pack:
2126
flavor: b1.small
2227
commands:
2328
- ./build.sh
24-
- npm install -g upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm
29+
- npm install -g upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2530
- upm-ci package pack --package-path com.unity.formats.fbx
2631
artifacts:
2732
packages:
2833
paths:
2934
- "upm-ci~/**/*"
3035

3136

32-
{% for editor in editors %}
37+
{% for editor in publish_trigger_editors %}
3338
{% for platform in platforms %}
3439
test_{{ platform.name }}_{{ editor.version }}:
3540
name : Test version {{ editor.version }} on {{ platform.name }}
@@ -38,7 +43,7 @@ test_{{ platform.name }}_{{ editor.version }}:
3843
image: {{ platform.image }}
3944
flavor: {{ platform.flavor}}
4045
commands:
41-
- npm install -g upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm
46+
- npm install -g upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
4247
- upm-ci package test --unity-version {{ editor.version }} --package-path com.unity.formats.fbx
4348
artifacts:
4449
logs:
@@ -54,41 +59,43 @@ test_{{ platform.name }}_{{ editor.version }}:
5459

5560
test_trigger:
5661
name: Tests Trigger
57-
agent:
58-
type: Unity::VM
59-
image: package-ci/win10:stable
60-
flavor: b1.small
61-
commands:
62-
- dir
6362
triggers:
6463
branches:
6564
only:
6665
- "/.*/"
6766
except:
6867
- master
69-
artifacts:
70-
logs:
71-
paths:
72-
- "upm-ci~/test-results/**/*"
73-
packages:
74-
paths:
75-
- "upm-ci~/packages/**/*"
7668
dependencies:
7769
- .yamato/upm-ci.yml#pack
78-
{% for editor in editors %}
70+
{% for editor in test_trigger_editors %}
7971
{% for platform in platforms %}
8072
- .yamato/upm-ci.yml#test_{{platform.name}}_{{editor.version}}
8173
{% endfor %}
8274
{% endfor %}
8375

76+
publish_test_trigger:
77+
name: Publish Tests Trigger
78+
triggers:
79+
tags:
80+
only:
81+
- /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?
82+
dependencies:
83+
- .yamato/upm-ci.yml#pack
84+
{% for editor in publish_trigger_editors %}
85+
{% for platform in platforms %}
86+
- .yamato/upm-ci.yml#test_{{platform.name}}_{{editor.version}}
87+
{% endfor %}
88+
{% endfor %}
89+
90+
8491
publish:
8592
name: Publish to Internal Registry
8693
agent:
8794
type: Unity::VM
8895
image: package-ci/win10:stable
8996
flavor: b1.small
9097
commands:
91-
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
98+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
9299
- upm-ci package publish --package-path com.unity.formats.fbx
93100
triggers:
94101
tags:
@@ -100,8 +107,5 @@ publish:
100107
- "upm-ci~/packages/*.tgz"
101108
dependencies:
102109
- .yamato/upm-ci.yml#pack
103-
{% for editor in editors %}
104-
{% for platform in platforms %}
105-
- .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
106-
{% endfor %}
107-
{% endfor %}
110+
- .yamato/upm-ci.yml#test_trigger
111+
- .yamato/upm-ci.yml#publish_test_trigger

CHANGELOG.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
# Changes in Fbx Exporter
22

3+
## [3.2.0-preview.2] - 2020-05-19
4+
### Added
5+
- Added an option to the Autodesk® Maya® integration Unity menu for creating an export set.
6+
- The option can be found in File > Unity > Create Export Set
7+
- Selecting this option will open a dialog allowing the user to select the desired export locations for model and animation files.
8+
- File > Unity > Export [Model Only|Animation Only] will also open the same dialog if the objects selected for export
9+
are not already in an export set.
10+
11+
### Changed
12+
- Do not search for Autodesk® installs in `D:/Program Files/Autodesk` (not a standard drive).
13+
- Update Unity Recorder dependency to version 2.2.0-preview.4.
14+
15+
### Fixed
16+
- Added a null check when inspecting whether a Timeline Clip is selected for export. This fixes a NullReferenceException when an object in the selection is null.
17+
- Fix issue where different Materials and Meshes with identical names export as a single material/mesh.
18+
- Fix skinned mesh always exports in bind pose regardless of current pose.
19+
- Import/Export in Maya Integration fails if FBX Import/Export settings file missing.
20+
321
## [3.1.0-preview.1] - 2020-04-02
422
### Fixed
5-
- Blendshapes naming in FBX so that multiple blendshapes all import correctly in Maya. Thank you to @lazlo-bonin for the fix.
23+
- Blendshapes naming in FBX so that multiple blendshapes all import correctly in Autodesk® Maya®. Thank you to @lazlo-bonin for the fix.
624
- Don't override transforms when creating FBX Linked Prefab, so that the prefab updates properly when the FBX transforms are modified.
725
- Changed FBX Linked Prefab to keep Unity materials instead of using materials exported to FBX file.
826
- To revert to using the FBX materials in the Linked Prefab, open the prefab editor and remove the material overrides.
9-
- Fix issue where Maya imports root bone as null object if it doesn't have any descendants that are also bones.
27+
- Fix issue where root bone is imported as null object in Autodesk® Maya® if it doesn't have any descendants that are also bones.
1028
- Don't reduce keyframes after recording as it can create unnecessary errors/discrepancies in the exported curve.
1129
- Updated to latest com.autodesk.fbx (3.0.1-preview.1), to fix DLL not found errors if building for non-standalone platforms (e.g. Android, WebGL).
1230

0 commit comments

Comments
 (0)