Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-06 17:54:14 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/same_material_copy

Browse Source
This commit is contained in:
ousttrue 2026-07-23 16:27:39 +09:00 committed by GitHub
commit 512db275ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Packages/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs
View File

@ -81,7 +81,21 @@ namespace UniGLTF
if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(externalTexture, out var texture2D, out var importer)) return;
Configure(texDesc, importer);
importer.SaveAndReimport();
// https://github.com/vrm-c/UniVRM/issues/2813 (4)
// https://github.com/vrm-c/UniVRM/issues/2783
//
// UnityException: Calls to "AssetDatabase.ImportAsset" are restricted during asset importing.
// Please make sure this function is not called from ScriptedImporters or PostProcessors,
// as it is a source of non-determinism.
var assetPath = importer.assetPath;
EditorApplication.delayCall += () =>
{
if (AssetImporter.GetAtPath(assetPath) is TextureImporter i)
{
i.SaveAndReimport();
}
};
}
}
}

4
Packages/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
View File

@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 0;
public const int MINOR = 131;
public const int PATCH = 1;
public const string VERSION = "0.131.1";
public const int PATCH = 2;
public const string VERSION = "0.131.2";
}
}

4
Packages/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 2;
public const int MINOR = 67;
public const int PATCH = 1;
public const string VERSION = "2.67.1";
public const int PATCH = 2;
public const string VERSION = "2.67.2";
}
}

2
Packages/UniGLTF/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.131.1",
"version": "0.131.2",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2021.3",

4
Packages/VRM/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.131.1",
"version": "0.131.2",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2021.3",
@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.gltf": "0.131.1",
"com.vrmc.gltf": "0.131.2",
"com.unity.ugui": "1.0.0"
},
"samples": [

12
Packages/VRM10/Samples~/ClothSample/ClothWarp/Editor/ClothWarpRootEditor.cs
View File

@ -154,8 +154,18 @@ namespace UniVRM10.ClothWarp.Components
p = m_target.GetParticleFromTransform(p.Transform);
var t = p.Transform;
Handles.color = Color.green;
Handles.SphereHandleCap(t.GetInstanceID(), t.position, t.rotation, p.Settings.Radius * 2, EventType.Repaint);
Handles.SphereHandleCap(t.GetControlId(), t.position, t.rotation, p.Settings.Radius * 2, EventType.Repaint);
}
}
}
static class ClothWarpRootEditorExtensions
{
internal static int GetControlId(this Component component)
#if UNITY_6000_5_OR_NEWER
=> component.GetEntityId().GetHashCode();
#else
=> component.GetInstanceID();
#endif
}
}

4
Packages/VRM10/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.131.1",
"version": "0.131.2",
"displayName": "VRM-1.0",
"description": "VRM-1.0 importer",
"unity": "2021.3",
@ -15,7 +15,7 @@
},
"dependencies": {
"com.unity.timeline": "1.7.6",
"com.vrmc.gltf": "0.131.1"
"com.vrmc.gltf": "0.131.2"
},
"samples": [
{

4
Packages/packages-lock.json
View File

@ -163,7 +163,7 @@
"depth": 0,
"source": "embedded",
"dependencies": {
"com.vrmc.gltf": "0.131.1",
"com.vrmc.gltf": "0.131.2",
"com.unity.ugui": "1.0.0"
}
},
@ -173,7 +173,7 @@
"source": "embedded",
"dependencies": {
"com.unity.timeline": "1.7.6",
"com.vrmc.gltf": "0.131.1"
"com.vrmc.gltf": "0.131.2"
}
},
"com.unity.modules.ai": {