UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-07 11:16:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
This commit is contained in:
badlogic 2019-10-09 14:25:35 +02:00
commit 2ea060ed7a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -189,6 +189,7 @@
* Removed dependency on `RHI`, `RenderCore`, and `ShaderCore`. * Removed dependency on `RHI`, `RenderCore`, and `ShaderCore`.
* Re-importing atlases and their textures now works consistently in all situations. * Re-importing atlases and their textures now works consistently in all situations.
* Added mix-and-match example to demonstrate the new Skin API. * Added mix-and-match example to demonstrate the new Skin API.
* Materials on `SkeletonRendererComponent` are now blueprint read and writeable. This allows setting dynamic material instances at runtime
## C# ## ## C# ##
* **Breaking changes** * **Breaking changes**

8
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonRendererComponent.h
View File

@ -50,16 +50,16 @@ public:
void UpdateRenderer(USpineSkeletonComponent* Skeleton); void UpdateRenderer(USpineSkeletonComponent* Skeleton);
// Material Instance parents // Material Instance parents
UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadOnly) UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadWrite)
UMaterialInterface* NormalBlendMaterial; UMaterialInterface* NormalBlendMaterial;
UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadOnly) UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadWrite)
UMaterialInterface* AdditiveBlendMaterial; UMaterialInterface* AdditiveBlendMaterial;
UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadOnly) UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadWrite)
UMaterialInterface* MultiplyBlendMaterial; UMaterialInterface* MultiplyBlendMaterial;
UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadOnly) UPROPERTY(Category = Spine, EditAnywhere, BlueprintReadWrite)
UMaterialInterface* ScreenBlendMaterial; UMaterialInterface* ScreenBlendMaterial;
// Need to hold on to the dynamic instances, or the GC will kill us while updating them // Need to hold on to the dynamic instances, or the GC will kill us while updating them