diff --git a/Sources/arm/node/MakePaint.hx b/Sources/arm/node/MakePaint.hx
index 29bd4bac..79a0f9f1 100644
--- a/Sources/arm/node/MakePaint.hx
+++ b/Sources/arm/node/MakePaint.hx
@@ -19,7 +19,10 @@ class MakePaint {
 			// cull_mode: "counter_clockwise",
 			cull_mode: "none",
 			vertex_elements: [{name: "pos", data: "short4norm"}, {name: "nor", data: "short2norm"}, {name: "tex", data: "short2norm"}],
-			color_attachments: [Context.layerIsMask ? "R8" : "RGBA32", "RGBA32", "RGBA32", "R8"]
+			color_attachments:
+				Context.tool == ToolColorId ? ["RGBA32"] :
+				Context.tool == ToolPicker ? [Context.layerIsMask ? "R8" : "RGBA32", "RGBA32", "RGBA32"] :
+					[Context.layerIsMask ? "R8" : "RGBA32", "RGBA32", "RGBA32", "R8"]
 		});
 
 		con_paint.data.color_writes_red = [true, true, true, true];
diff --git a/Sources/arm/node/MakeParticle.hx b/Sources/arm/node/MakeParticle.hx
index 935d9d85..420f6b3a 100644
--- a/Sources/arm/node/MakeParticle.hx
+++ b/Sources/arm/node/MakeParticle.hx
@@ -11,7 +11,8 @@ class MakeParticle {
 			depth_write: false,
 			compare_mode: "always",
 			cull_mode: "clockwise",
-			vertex_elements: [{name: "pos", data: "short4norm"}]
+			vertex_elements: [{name: "pos", data: "short4norm"}],
+			color_attachments: ["R8"]
 		});
 
 		var vert = con_part.make_vert();