1
0
Fork 0

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sommerlilie 2018-04-23 23:40:53 +02:00
commit e830123dc7

View file

@ -675,7 +675,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
maxColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@ -5206,7 +5206,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
maxColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}