tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-06 04:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Command Queue Crash

Browse Source 
* No longer allow sending an object (texture) to the server as material parameter
* Keep a parameter cache locally in ShaderMaterial
This commit is contained in:
reduz
2021-07-07 10:57:56 -03:00
parent 8cd1b59ea7
commit d41e3f9aeb
8 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/3d/visual_instance_3d.cpp
+6 -1
View File
@@ -293,7 +293,12 @@ void GeometryInstance3D::set_shader_instance_uniform(const StringName &p_uniform
instance_uniforms.erase(p_value);
} else {
instance_uniforms[p_uniform] = p_value;
RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, p_value);
if (p_value.get_type() == Variant::OBJECT) {
RID tex_id = p_value;
RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, tex_id);
} else {
RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, p_value);
}
}
}