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

Merge cleanup

Browse Source
This commit is contained in:
luboslenco
2021-01-14 12:19:24 +01:00
parent 94ec112247
commit 673fef231d
24 changed files with 76 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/render/Inc.hx
+1 -1
View File
@@ -184,7 +184,7 @@ class Inc {
}
}
if (Context.ddirty <= 0 && Context.rdirty <= 0 && (Context.pdirty <= 0 || UIHeader.inst.worktab.position == SpaceRender)) {
if (Context.ddirty <= 0 && Context.rdirty <= 0 && Context.pdirty <= 0) {
if (mx != lastX || my != lastY || mouse.locked) Context.ddirty = 0;
#if kha_metal
if (Context.ddirty > -4) {
Sources/arm/render/RenderPathPaint.hx
+1 -1
View File
@@ -411,7 +411,7 @@ class RenderPathPaint {
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) {
if (!App.uiEnabled || App.isDragging || fillLayer || fillMask) {
return;
}
Sources/arm/render/RenderPathPreview.hx
+1 -1
View File
@@ -123,7 +123,7 @@ class RenderPathPreview {
#end
var framebuffer = "texpreview";
var selectedMat = UIHeader.inst.worktab.position == SpaceRender ? Context.materialScene : Context.material;
var selectedMat = Context.material;
RenderPath.active.renderTargets.get("texpreview").image = selectedMat.image;
RenderPath.active.renderTargets.get("texpreview_icon").image = selectedMat.imageIcon;