Fix mask dilate
This commit is contained in:
@@ -547,7 +547,7 @@ class Layers {
|
||||
Context.layer = l;
|
||||
setObjectMask();
|
||||
RenderPathPaint.commandsPaint(false);
|
||||
RenderPathPaint.dilate(true, true);
|
||||
RenderPathPaint.dilate(true, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -320,7 +320,7 @@ class MakeMaterial {
|
||||
Context.pdirty = 1;
|
||||
RenderPathPaint.useLiveLayer(true);
|
||||
RenderPathPaint.commandsPaint(false);
|
||||
RenderPathPaint.dilate(true, true);
|
||||
RenderPathPaint.dilate(true, false);
|
||||
RenderPathPaint.useLiveLayer(false);
|
||||
MaterialParser.bake_passthrough = false;
|
||||
Context.pdirty = 0;
|
||||
|
||||
@@ -759,14 +759,15 @@ class RenderPathPaint {
|
||||
Layers.makeTempImg();
|
||||
var tid = Context.layer.id;
|
||||
if (base) {
|
||||
var texpaint = Context.layerIsMask ? "texpaint_mask" : "texpaint";
|
||||
path.setTarget("temptex0");
|
||||
path.bindTarget("texpaint" + tid, "tex");
|
||||
path.bindTarget(texpaint + tid, "tex");
|
||||
path.drawShader("shader_datas/copy_pass/copy_pass");
|
||||
path.setTarget("texpaint" + tid);
|
||||
path.setTarget(texpaint + tid);
|
||||
path.bindTarget("temptex0", "tex");
|
||||
path.drawShader("shader_datas/dilate_pass/dilate_pass");
|
||||
}
|
||||
if (nor_pack) {
|
||||
if (nor_pack && !Context.layerIsMask) {
|
||||
path.setTarget("temptex0");
|
||||
path.bindTarget("texpaint_nor" + tid, "tex");
|
||||
path.drawShader("shader_datas/copy_pass/copy_pass");
|
||||
|
||||
@@ -108,8 +108,8 @@ class UVUtil {
|
||||
|
||||
if (pipeDilate == null) {
|
||||
pipeDilate = new PipelineState();
|
||||
pipeDilate.vertexShader = kha.Shaders.getVertex("dilate_mask.vert");
|
||||
pipeDilate.fragmentShader = kha.Shaders.getFragment("dilate_mask.frag");
|
||||
pipeDilate.vertexShader = kha.Shaders.getVertex("dilate_map.vert");
|
||||
pipeDilate.fragmentShader = kha.Shaders.getFragment("dilate_map.frag");
|
||||
var vs = new VertexStructure();
|
||||
#if (kha_metal || kha_vulkan)
|
||||
vs.add("tex", VertexData.Short2Norm);
|
||||
|
||||
Reference in New Issue
Block a user