Ver código fonte

[unity] Fixed rare import error that material.mainTexture is null ("Material is missing texture").

Harald Csaszar 3 anos atrás
pai
commit
6fc6e090ae

+ 3 - 3
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs

@@ -582,6 +582,8 @@ namespace Spine.Unity.Editor {
 					material = defaultShader != null ? new Material(defaultShader) : null;
 					if (material) {
 						ApplyPMAOrStraightAlphaSettings(material, SpineEditorUtilities.Preferences.textureSettingsReference);
+						if (texture != null)
+							material.mainTexture = texture;
 						AssetDatabase.CreateAsset(material, materialPath);
 					}
 				} else {
@@ -589,10 +591,8 @@ namespace Spine.Unity.Editor {
 				}
 
 				if (material != null) {
-					if (texture != null) {
+					if (texture != null)
 						material.mainTexture = texture;
-					}
-
 					EditorUtility.SetDirty(material);
 					// note: don't call AssetDatabase.SaveAssets() since this would trigger OnPostprocessAllAssets() every time unnecessarily.
 					populatingMaterials.Add(material); //atlasAsset.materials[i] = mat;