Fix merge

This commit is contained in:
JMS55 2025-07-06 17:15:29 -04:00
parent 951c3f9eeb
commit 742ebfa8ac
3 changed files with 2 additions and 2 deletions

View File

@ -14,7 +14,7 @@ use bevy_ecs::{
use bevy_reflect::{prelude::ReflectDefault, reflect_remote, Reflect}; use bevy_reflect::{prelude::ReflectDefault, reflect_remote, Reflect};
use bevy_render::{ use bevy_render::{
camera::{MipBias, TemporalJitter}, camera::{MipBias, TemporalJitter},
render_graph::{RenderGraphApp, ViewNodeRunner}, render_graph::{RenderGraphExt, ViewNodeRunner},
renderer::RenderDevice, renderer::RenderDevice,
view::{prepare_view_targets, prepare_view_uniforms, Hdr}, view::{prepare_view_targets, prepare_view_uniforms, Hdr},
ExtractSchedule, Render, RenderApp, RenderSystems, ExtractSchedule, Render, RenderApp, RenderSystems,

View File

@ -3,6 +3,7 @@ pub mod window;
use bevy_camera::{ use bevy_camera::{
primitives::Frustum, CameraMainTextureUsages, ClearColor, ClearColorConfig, Exposure, primitives::Frustum, CameraMainTextureUsages, ClearColor, ClearColorConfig, Exposure,
MainPassResolutionOverride,
}; };
use bevy_diagnostic::FrameCount; use bevy_diagnostic::FrameCount;
pub use visibility::*; pub use visibility::*;

View File

@ -43,7 +43,6 @@ type TaaComponents = (
TemporalAntiAliasing, TemporalAntiAliasing,
TemporalJitter, TemporalJitter,
MipBias, MipBias,
MipBias,
DepthPrepass, DepthPrepass,
MotionVectorPrepass, MotionVectorPrepass,
); );