Apply blend modes to export/preview, add unfinished warning

Brackeys · Jul 25, 2015 · 4e5501b · 4e5501b
1 parent c1e5f9b
commit 4e5501b
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/Assets/BlendModeTest.png b/Assets/BlendModeTest.png
diff --git a/Assets/BlendModeTest.png.meta b/Assets/BlendModeTest.png.meta
diff --git a/Assets/UPAToolkit/Editor/EditorGUI/UPALayerSettings.cs b/Assets/UPAToolkit/Editor/EditorGUI/UPALayerSettings.cs
@@ -42,6 +42,10 @@ public class UPALayerSettings : EditorWindow {
 		// Edit blend mode and opacity
 		GUILayout.Label ("Blending", EditorStyles.boldLabel);
 		layer.mode = (UPALayer.BlendMode) EditorGUILayout.EnumPopup ("Mode: ", layer.mode);
+		if (layer.mode != UPALayer.BlendMode.NORMAL)
+		{
+			GUILayout.Label("Some blend modes are still in testing and might not produce\nentirely accurate results.");
+		}
 		layer.opacity = EditorGUILayout.IntSlider ("Opacity: ", Mathf.RoundToInt(layer.opacity * 100), 0, 100) / 100f;
 	}
 }
diff --git a/Assets/UPAToolkit/Editor/UPAImage.cs b/Assets/UPAToolkit/Editor/UPAImage.cs
@@ -189,12 +189,7 @@ public int layerCount
 		if (!dirty && finalImg != null || !update && finalImg != null)
 			return finalImg;
 
-		finalImg = new Texture2D(width, height);
-		for (int x = 0; x < width; x++) {
-			for (int y = 0; y < height; y++) {
-				finalImg.SetPixel (x,y, GetBlendedPixel (x,y));
-			}
-		}
+		finalImg = UPADrawer.CalculateBlendedTex(layers);
 		finalImg.filterMode = FilterMode.Point;
 		finalImg.Apply();