Merging changes from private branch

2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
@@ -46,9 +46,5 @@ void main(){
        color.rgb = S2;
    }

-    if(orig.g > 0.01){
-        color = max(S1, color);
-    }
-
-    gl_FragColor = color;
+    gl_FragColor = vec4(max(S1, color).rgb, orig.a);
 }