edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Decal paint -> decal mask

Browse Source
This commit is contained in:
luboslenco
2020-10-24 13:30:23 +02:00
parent 9ee816d4cc
commit 9da935e339
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/render/RenderPathPaint.hx
+4 -4
View File
@@ -361,14 +361,14 @@ class RenderPathPaint {
public static function commandsCursor() {
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint);
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask);
var tool = Context.tool;
if (tool != ToolBrush &&
tool != ToolEraser &&
tool != ToolClone &&
tool != ToolBlur &&
tool != ToolParticle &&
!decalPaint) {
!decalMask) {
return;
}
if (!App.uiEnabled || UIHeader.inst.worktab.position == SpaceRender) {
@@ -408,8 +408,8 @@ class RenderPathPaint {
path.setTarget("");
g.setPipeline(Layers.pipeCursor);
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint);
var img = (decal && !decalPaint) ? Context.decalImage : Res.get("cursor.k");
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask);
var img = (decal && !decalMask) ? Context.decalImage : Res.get("cursor.k");
g.setTexture(Layers.cursorTex, img);
var gbuffer0 = path.renderTargets.get("gbuffer0").image;
g.setTextureDepth(Layers.cursorGbufferD, gbuffer0);