Skip to content

Commit 6406fe0

Browse files
committed
Fix up a handful of cases not covered by the merge.
1 parent 97b97b5 commit 6406fe0

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

crates/bevy_pbr/src/wireframe.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use bevy_ecs::{
2222
use bevy_platform::{
2323
collections::{HashMap, HashSet},
2424
hash::FixedHasher,
25+
sync::Arc,
2526
};
2627
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
2728
use bevy_render::camera::extract_cameras;
@@ -471,7 +472,7 @@ impl RenderAsset for RenderWireframeMaterial {
471472
type Param = ();
472473

473474
fn prepare_asset(
474-
source_asset: Self::SourceAsset,
475+
source_asset: Arc<Self::SourceAsset>,
475476
_asset_id: AssetId<Self::SourceAsset>,
476477
_param: &mut SystemParamItem<Self::Param>,
477478
) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {

crates/bevy_sprite/src/mesh2d/wireframe2d.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use bevy_ecs::{
2222
use bevy_platform::{
2323
collections::{HashMap, HashSet},
2424
hash::FixedHasher,
25+
sync::Arc,
2526
};
2627
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
2728
use bevy_render::{
@@ -470,7 +471,7 @@ impl RenderAsset for RenderWireframeMaterial {
470471
type Param = ();
471472

472473
fn prepare_asset(
473-
source_asset: Self::SourceAsset,
474+
source_asset: Arc<Self::SourceAsset>,
474475
_asset_id: AssetId<Self::SourceAsset>,
475476
_param: &mut SystemParamItem<Self::Param>,
476477
) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {

crates/bevy_ui/src/widget/viewport.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ pub fn update_viewport_render_target_size(
171171
height: u32::max(1, size.y as u32),
172172
..default()
173173
};
174-
let image = images.get_mut(image_handle).unwrap();
174+
let image = images.get_cloned_mut(image_handle).unwrap();
175175
if image.data.is_some() {
176176
image.resize(size);
177177
} else {

0 commit comments

Comments
 (0)