UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2023-03-15 10:56:05 +01:00
commit 5f0cb66cad
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-c/spine-c/src/spine/Atlas.c
View File

@ -99,6 +99,11 @@ spAtlasPage *spAtlasPage_create(spAtlas *atlas, const char *name) {
spAtlasPage *self = NEW(spAtlasPage); spAtlasPage *self = NEW(spAtlasPage);
CONST_CAST(spAtlas *, self->atlas) = atlas; CONST_CAST(spAtlas *, self->atlas) = atlas;
MALLOC_STR(self->name, name); MALLOC_STR(self->name, name);
self->minFilter = SP_ATLAS_NEAREST;
self->magFilter = SP_ATLAS_NEAREST;
self->format = SP_ATLAS_RGBA8888;
self->uWrap = SP_ATLAS_CLAMPTOEDGE;
self->vWrap = SP_ATLAS_CLAMPTOEDGE;
return self; return self;
} }

2
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -1097,7 +1097,7 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
toColor(dark, 0), toColor(dark, 0),
toColor(dark, 1), toColor(dark, 1),
toColor(dark, 2), toColor(dark, 2),
toColor(dark, 3)); 1.0f);
} }
item = Json_getItem(slotMap, "attachment"); item = Json_getItem(slotMap, "attachment");