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

Merge pull request #12228 from hi-ogawa/fix-spatial-shader-conversion-with-texture

Browse Source 
Fix spatial shader conversion with texture
This commit is contained in:
Rémi Verschelde
2017-10-20 23:55:58 +02:00
committed by GitHub
parent 7969565de7 3bd2a4c421
commit 8cb76888ae
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/plugins/material_editor_plugin.cpp
+10 -2
View File
@@ -450,8 +450,16 @@ Ref<Resource> SpatialMaterialConversionPlugin::convert(const Ref<Resource> &p_re
VS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
for (List<PropertyInfo>::Element *E = params.front(); E; E = E->next()) {
Variant value = VS::get_singleton()->material_get_param(mat->get_rid(), E->get().name);
smat->set_shader_param(E->get().name, value);
// Texture parameter has to be treated specially since SpatialMaterial saved it
// as RID but ShaderMaterial needs Texture itself
Ref<Texture> texture = mat->get_texture_by_name(E->get().name);
if (texture.is_valid()) {
smat->set_shader_param(E->get().name, texture);
} else {
Variant value = VS::get_singleton()->material_get_param(mat->get_rid(), E->get().name);
smat->set_shader_param(E->get().name, value);
}
}
smat->set_render_priority(mat->get_render_priority());