diff --git a/bevy_derive/src/lib.rs b/bevy_derive/src/lib.rs index ef80a7bf4f..2b2217f685 100644 --- a/bevy_derive/src/lib.rs +++ b/bevy_derive/src/lib.rs @@ -40,7 +40,7 @@ struct UniformAttributeArgs { #[darling(default)] pub shader_def: Option, #[darling(default)] - pub vertex_buffer: Option, + pub instanceable: Option, } #[proc_macro_derive(Uniforms, attributes(uniform))] @@ -139,10 +139,10 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream { texture_and_sampler_name_strings.push(sampler.clone()); texture_and_sampler_name_idents.push(f.ident.clone()); texture_and_sampler_name_idents.push(f.ident.clone()); - let is_vertex_buffer_member = match attrs { + let is_instanceable = match attrs { Some(attrs) => { - match attrs.vertex_buffer { - Some(vertex_buffer) => vertex_buffer, + match attrs.instanceable { + Some(instanceable) => instanceable, None => false, } }, @@ -153,7 +153,7 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream { uniform_name: #uniform, texture_name: #texture, sampler_name: #sampler, - is_vertex_buffer_member: #is_vertex_buffer_member, + is_instanceable: #is_instanceable, }) }); diff --git a/src/render/shader/uniform.rs b/src/render/shader/uniform.rs index 9b9b60b0da..5c4e12980e 100644 --- a/src/render/shader/uniform.rs +++ b/src/render/shader/uniform.rs @@ -110,7 +110,7 @@ pub struct FieldInfo { pub uniform_name: &'static str, pub texture_name: &'static str, pub sampler_name: &'static str, - pub is_vertex_buffer_member: bool, + pub is_instanceable: bool, } pub trait AsFieldBindType { diff --git a/src/render/shader/uniforms/local_to_world.rs b/src/render/shader/uniforms/local_to_world.rs index 3627244e3d..48d2baabb1 100644 --- a/src/render/shader/uniforms/local_to_world.rs +++ b/src/render/shader/uniforms/local_to_world.rs @@ -13,7 +13,7 @@ const LOCAL_TO_WORLD_FIELD_INFOS: &[FieldInfo] = &[FieldInfo { uniform_name: "Object", texture_name: "", sampler_name: "", - is_vertex_buffer_member: false, + is_instanceable: false, }]; impl AsUniforms for bevy_transform::prelude::LocalToWorld {