seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102280 from Chaosus/fix_particles_process_shader_crash

Browse Source 
Fix crash when assigning wrong shader to particle process material
This commit is contained in:
Rémi Verschelde
2025-02-11 23:58:56 +01:00
parent 5da6deaaca 53e6d30771
commit d967d8d9bd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
View File

@ -1325,10 +1325,11 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
void ParticlesStorage::_particles_update_buffers(Particles *particles) { void ParticlesStorage::_particles_update_buffers(Particles *particles) {
uint32_t userdata_count = 0; uint32_t userdata_count = 0;
MaterialStorage::ShaderData *shader_data = MaterialStorage::get_singleton()->material_get_shader_data(particles->process_material); if (particles->process_material.is_valid()) {
if (shader_data) { ParticleProcessMaterialData *material_data = static_cast<ParticleProcessMaterialData *>(MaterialStorage::get_singleton()->material_get_data(particles->process_material, MaterialStorage::SHADER_TYPE_PARTICLES));
const ParticlesShaderData *particle_shader_data = static_cast<const ParticlesShaderData *>(shader_data); if (material_data && material_data->shader_data->version.is_valid() && material_data->shader_data->valid) {
userdata_count = particle_shader_data->userdata_count; userdata_count = material_data->shader_data->userdata_count;
}
} }
bool uses_motion_vectors = RSG::viewport->get_num_viewports_with_motion_vectors() > 0 || (RendererCompositorStorage::get_singleton()->get_num_compositor_effects_with_motion_vectors() > 0); bool uses_motion_vectors = RSG::viewport->get_num_viewports_with_motion_vectors() > 0 || (RendererCompositorStorage::get_singleton()->get_num_compositor_effects_with_motion_vectors() > 0);