Merge branch '3.8' into 3.9-beta

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

View File

@ -189,6 +189,7 @@
* Removed dependency on `RHI`, `RenderCore`, and `ShaderCore`.
* Re-importing atlases and their textures now works consistently in all situations.
* 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# ##
* **Breaking changes**

View File

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