diff --git a/addons/material_maker/library/base.json b/addons/material_maker/library/base.json index 9765c5b..efe2dd9 100644 --- a/addons/material_maker/library/base.json +++ b/addons/material_maker/library/base.json @@ -22,7 +22,7 @@ { "tree_item":"Generators/Image", "type":"image", - "file_path":"res://addons/material_maker/nodes/godot_logo.png" + "file_path":"res://addons/material_maker/nodes/image/godot_logo.png" }, { "tree_item":"Generators/Pattern", diff --git a/addons/material_maker/nodes/emboss/emboss.gd b/addons/material_maker/nodes/emboss/emboss.gd index 3247315..b7c084e 100644 --- a/addons/material_maker/nodes/emboss/emboss.gd +++ b/addons/material_maker/nodes/emboss/emboss.gd @@ -45,12 +45,12 @@ func get_textures(): list[name] = final_texture return list -func _get_shader_code(uv): +func _get_shader_code(uv, slot = 0): var rv = { defs="", code="" } var src = get_source() if src == null: return rv - input_shader = get_parent().generate_shader(src.get_shader_code_get_globals("UV")) + input_shader = get_parent().renderer.generate_shader(src.get_shader_code_with_globals("UV")) _rerender() if generated_variants.empty(): rv.defs = "uniform sampler2D %s_tex;\n" % [ name ] diff --git a/addons/material_maker/nodes/image/image.gd b/addons/material_maker/nodes/image/image.gd index bf22660..c732792 100644 --- a/addons/material_maker/nodes/image/image.gd +++ b/addons/material_maker/nodes/image/image.gd @@ -19,7 +19,7 @@ func get_textures(): list[name] = $TextureButton.texture_normal return list -func _get_shader_code(uv): +func _get_shader_code(uv, slot = 0): var rv = { defs="", code="" } if generated_variants.empty(): rv.defs = "uniform sampler2D %s_tex;\n" % [ name ]