Fixed the HUDFPS setting global ui colors. Fixed avatar creation on 5…

….2. Fixed if defs in Customization to include 5.2 and future version.
huika · Oct 4, 2015 · 1a901be · 1a901be
1 parent 5fd2faa
commit 1a901be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAGeneratorBase.cs b/UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAGeneratorBase.cs
@@ -96,7 +96,7 @@ public void RestoreAnimatorState(Animator animator)
 					}
 				}
 
-				animator.Update(0);
+				animator.Update(0.00001f);
 				animator.enabled = animating;
 			}
 		}	

diff --git a/UMAProject/Assets/UMA/Example/Scripts/HUDFPS.cs b/UMAProject/Assets/UMA/Example/Scripts/HUDFPS.cs
@@ -38,7 +38,8 @@ void Start()
 			enabled = false;
 			return;
 		}
-		timeleft = updateInterval;  
+		timeleft = updateInterval;
+		fpsTextOutput.material = new Material(fpsTextOutput.material);
 	}
 
 	void Update()

diff --git a/UMAProject/Assets/UMA/Example/Scripts/UMACustomization.cs b/UMAProject/Assets/UMA/Example/Scripts/UMACustomization.cs
@@ -208,7 +208,7 @@ private void SetCamera(bool show)
             Camera.main.rect = ViewPortReduced;
             DnaPanel.SetActive(true);
             DnaHide.gameObject.SetActive(true);
-#if UNITY_5_2	
+#if UNITY_5 && !UNITY_5_1 && !UNITY_5_0
 			// really Unity? Yes we change the value and set it back to trigger a ui recalculation... 
 			// because setting the damn game object active doesn't do that!
 			var rt = DnaPanel.GetComponent<RectTransform>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ public void RestoreAnimatorState(Animator animator) @@
     					}
     				}
-    				animator.Update(0);
+    				animator.Update(0.00001f);
     				animator.enabled = animating;
     			}
     		}
@@ Expand Down @@