mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 01:36:02 +08:00
Merge branch '4.1' into 4.2-beta
This commit is contained in:
commit
2dd17f4228
@ -174,10 +174,10 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
|
|||||||
SlotData *slotData = new (__FILE__, __LINE__) SlotData(i, String(slotName, true), *boneData);
|
SlotData *slotData = new (__FILE__, __LINE__) SlotData(i, String(slotName, true), *boneData);
|
||||||
|
|
||||||
readColor(input, slotData->getColor());
|
readColor(input, slotData->getColor());
|
||||||
|
unsigned char a = readByte(input);
|
||||||
unsigned char r = readByte(input);
|
unsigned char r = readByte(input);
|
||||||
unsigned char g = readByte(input);
|
unsigned char g = readByte(input);
|
||||||
unsigned char b = readByte(input);
|
unsigned char b = readByte(input);
|
||||||
unsigned char a = readByte(input);
|
|
||||||
if (!(r == 0xff && g == 0xff && b == 0xff && a == 0xff)) {
|
if (!(r == 0xff && g == 0xff && b == 0xff && a == 0xff)) {
|
||||||
slotData->getDarkColor().set(r / 255.0f, g / 255.0f, b / 255.0f, 1);
|
slotData->getDarkColor().set(r / 255.0f, g / 255.0f, b / 255.0f, 1);
|
||||||
slotData->setHasDarkColor(true);
|
slotData->setHasDarkColor(true);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user