Forward fixes

Sources/arm/render/RenderPathForward.hx

@@ -136,12 +136,23 @@ class RenderPathForward {
 		Scene.active.camera.buildMatrix();
 
 		RenderPathPaint.begin();
+
 		drawSplit();
-
-		RenderPathPaint.draw();
-
 		#end // arm_painter
 
+		drawGbuffer();
+
+		#if arm_painter
+		RenderPathPaint.draw();
+		#end
+
+		#if kha_direct3d12
+		if (UITrait.inst.viewportMode == 10) { // Ray-traced
+			RenderPathRaytrace.draw();
+			return;
+		}
+		#end
+
 		drawForward();
 
 		#if arm_painter
@@ -152,7 +163,7 @@ class RenderPathForward {
 		RenderPathDeferred.taaFrame++;
 	}
 
-	static function drawForward() {
+	static function drawGbuffer() {
 		path.setTarget("gbuffer0");
 		path.clearTarget(null, 1.0);
 		path.setTarget("gbuffer2");
@@ -162,7 +173,9 @@ class RenderPathForward {
 		RenderPathPaint.bindLayers();
 		#end
 		path.drawMeshes("mesh");
+	}
 
+	static function drawForward() {
 		path.setDepthFrom("gbuffer1", "gbuffer0");
 		path.setTarget("gbuffer1");
 		path.drawSkydome("world_pass/world_pass/world_pass");
@@ -241,6 +254,8 @@ class RenderPathForward {
 				cam.buildMatrix();
 				cam.buildProjection();
 
+				drawGbuffer();
+
 				#if kha_direct3d12
 				UITrait.inst.viewportMode == 10 ? RenderPathRaytrace.draw() : drawForward();
 				#else

Sources/arm/render/Uniforms.hx

@@ -280,7 +280,7 @@ class Uniforms {
 	public static function linkTex(object:Object, mat:MaterialData, link:String):kha.Image {
 		#if arm_painter
 		if (link == "_texcolorid") {
-			if (Project.assets.length == 0) return null;
+			if (Project.assets.length == 0) return RenderPath.active.renderTargets.get("empty_white").image;
 			else return UITrait.inst.getImage(Project.assets[UITrait.inst.colorIdHandle.position]);
 		}
 		if (link == "_texuvmap") {