Skip to content

Commit 754968b

Browse files
committed
Fix CI.
1 parent 6e62096 commit 754968b

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/processing_pyo3/src/particles.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::collections::HashMap;
88
use crate::compute::{Buffer, Compute};
99
use crate::graphics::Geometry;
1010

11-
#[pyclass(eq, eq_int)]
11+
#[pyclass(eq, eq_int, from_py_object)]
1212
#[derive(Clone, Copy, PartialEq, Eq)]
1313
pub enum AttributeFormat {
1414
Float = 1,
@@ -48,7 +48,7 @@ impl AttributeFormat {
4848

4949
/// named typed attribute. use the `position()`/`color()`/etc. classmethods for
5050
/// builtins or `Attribute(name, format)` for custom ones.
51-
#[pyclass(unsendable, frozen, hash, eq)]
51+
#[pyclass(unsendable, frozen, hash, eq, from_py_object)]
5252
#[derive(Clone, PartialEq, Eq, Hash)]
5353
pub struct Attribute {
5454
pub(crate) entity: Entity,

crates/processing_render/src/material/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,14 @@ impl MaterialExtension for ProcessingMaterial {
196196
_layout: &MeshVertexBufferLayoutRef,
197197
key: MaterialExtensionKey<Self>,
198198
) -> std::result::Result<(), SpecializedMeshPipelineError> {
199-
if let Some(blend_state) = key.bind_group_data.blend_state {
200-
if let Some(fragment_state) = &mut descriptor.fragment {
201-
fragment_state.targets.iter_mut().for_each(|target| {
202-
if let Some(target) = target {
203-
target.blend = Some(blend_state);
204-
}
205-
});
206-
}
199+
if let Some(blend_state) = key.bind_group_data.blend_state
200+
&& let Some(fragment_state) = &mut descriptor.fragment
201+
{
202+
fragment_state.targets.iter_mut().for_each(|target| {
203+
if let Some(target) = target {
204+
target.blend = Some(blend_state);
205+
}
206+
});
207207
}
208208
Ok(())
209209
}

examples/input.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ fn sketch() -> error::Result<()> {
4141
graphics,
4242
DrawCommand::Fill(bevy::color::Color::srgb(0.25, 0.15, 0.2)),
4343
)?;
44-
} else {
4544
}
4645

4746
if input_mouse_is_pressed()? {
4847
graphics_record_command(
4948
graphics,
5049
DrawCommand::Fill(bevy::color::Color::srgb(0.55, 0.25, 0.2)),
5150
)?;
52-
} else {
5351
}
5452

5553
graphics_record_command(

0 commit comments

Comments
 (0)