Compare commits

..

5 Commits

Author SHA1 Message Date
Takashi Sakai 674c1e858b Merge pull request #22 from mob-sakai/hotfix
Release 1.4.3
2018-01-15 09:11:39 +09:00
Takashi Sakai 67c35affec Release 1.4.3 2018-01-15 08:56:58 +09:00
Takashi Sakai 7fe0b44e56 Fixed: Color effect is incorrect. #19 2018-01-15 08:56:25 +09:00
Takashi Sakai 0c2a515abc Export 1.4.2 2018-01-15 01:39:03 +09:00
Takashi Sakai 2c7df2a749 Fixed: Error has occur on after deserialize. 2018-01-15 01:34:20 +09:00
4 changed files with 13 additions and 1 deletions
+8
View File
@@ -98,6 +98,14 @@ Please enable `TexCoord1` to use UIEffect.
## Release Notes
### ver.1.4.3
* Fixed: Color effect is incorrect. [#19](https://github.com/mob-sakai/UIEffect/issues/19)
### ver.1.4.2
* Fixed: Error has occur on after deserialize. [#16](https://github.com/mob-sakai/UIEffect/issues/16)
### ver.1.4.1
* Fixed: Demo link in `readme.md` is broken.
+1 -1
View File
@@ -171,7 +171,7 @@ Shader "UI/Hidden/UI-Effect"
#endif
#if defined (UI_COLOR)
color = ApplyColorEffect(color, IN.colorFactor); // Color effect.
color = ApplyColorEffect(color, IN.colorFactor) * IN.color; // Color effect.
#endif
return color;
+4
View File
@@ -329,8 +329,12 @@ namespace UnityEngine.UI
public void OnAfterDeserialize()
{
var obj = this;
EditorApplication.delayCall += () =>
{
if (!obj)
return;
var old = m_EffectMaterial;
m_EffectMaterial = GetMaterial(Shader.Find(shaderName), toneMode, colorMode, blurMode);
if (old != m_EffectMaterial)
Binary file not shown.