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

Skip cursor for fill layers

Browse Source
This commit is contained in:
luboslenco
2020-12-16 14:34:24 +01:00
parent ce632a386e
commit 7a1df6f7c0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/plugin/Gizmo.hx
+1 -1
View File
@@ -23,7 +23,7 @@ class Gizmo {
var isRender = UIHeader.inst.worktab.position == SpaceRender;
var isPaint = UIHeader.inst.worktab.position == SpacePaint;
var isObject = isRender && Context.object != null;
var isDecal = isPaint && Context.layer.fill_layer != null && Context.layer.uvType == UVProject;
var isDecal = isPaint && Context.layer.fill_layer != null && Context.layer.uvType == UVProject && !Context.layerIsMask;
var gizmo = Context.gizmo;
var hide = Operator.shortcut(Config.keymap.stencil_hide, ShortcutDown);
Sources/arm/render/LineDraw.hx
+1 -1
View File
@@ -44,7 +44,7 @@ class LineDraw {
var hide = Operator.shortcut(Config.keymap.stencil_hide, ShortcutDown) || iron.system.Input.getKeyboard().down("control");
var isPaint = UIHeader.inst.worktab.position == SpacePaint;
var isDecal = isPaint && Context.layer.fill_layer != null && Context.layer.uvType == UVProject;
var isDecal = isPaint && Context.layer.fill_layer != null && Context.layer.uvType == UVProject && !Context.layerIsMask;
if (!isDecal || hide) return;
mat = Context.layer.decalMat;
Sources/arm/render/RenderPathPaint.hx
+4 -1
View File
@@ -408,7 +408,10 @@ class RenderPathPaint {
!decalMask) {
return;
}
if (!App.uiEnabled || UIHeader.inst.worktab.position == SpaceRender) {
var fillLayer = Context.layer.fill_layer != null && !Context.layerIsMask;
var fillMask = Context.layer.fill_mask != null && Context.layerIsMask;
if (!App.uiEnabled || App.isDragging || UIHeader.inst.worktab.position == SpaceRender || fillLayer || fillMask) {
return;
}