From b2cf59f882eb146e16775732fd9a8c0b7b360845 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 22 Sep 2020 10:31:30 +0200 Subject: [PATCH] Decal paint work --- Sources/arm/render/RenderPathPaint.hx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Sources/arm/render/RenderPathPaint.hx b/Sources/arm/render/RenderPathPaint.hx index 7c8fd1ac..90ca3b1d 100644 --- a/Sources/arm/render/RenderPathPaint.hx +++ b/Sources/arm/render/RenderPathPaint.hx @@ -360,12 +360,15 @@ class RenderPathPaint { } public static function commandsCursor() { + var decal = Context.tool == ToolDecal || Context.tool == ToolText; + var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint); var tool = Context.tool; if (tool != ToolBrush && tool != ToolEraser && tool != ToolClone && tool != ToolBlur && - tool != ToolParticle) { + tool != ToolParticle && + !decalPaint) { return; } if (!App.uiEnabled || UIHeader.inst.worktab.position == SpaceRender) { @@ -405,7 +408,8 @@ class RenderPathPaint { path.setTarget(""); g.setPipeline(Layers.pipeCursor); var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var img = decal ? Context.decalImage : Res.get("cursor.k"); + var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint); + var img = (decal && !decalPaint) ? Context.decalImage : Res.get("cursor.k"); g.setTexture(Layers.cursorTex, img); var gbuffer0 = path.renderTargets.get("gbuffer0").image; g.setTextureDepth(Layers.cursorGbufferD, gbuffer0);