Merge branch 'master' of github.com:okamstudio/godot

Conflicts:
	platform/x11/detect.py

1 files changed, 10 insertions, 0 deletions

diff --git a/servers/visual/rasterizer_dummy.cpp b/servers/visual/rasterizer_dummy.cpp
index a399960014..6c1b6697c1 100644
--- a/servers/visual/rasterizer_dummy.cpp
+++ b/servers/visual/rasterizer_dummy.cpp
@@ -231,6 +231,11 @@ RID RasterizerDummy::shader_get_default_texture_param(RID p_shader, const String
 	return RID();
 }
 
+Variant RasterizerDummy::shader_get_default_param(RID p_shader, const StringName& p_name) {
+
+	return Variant();
+}
+
 /* COMMON MATERIAL API */
 
 
@@ -1617,6 +1622,11 @@ void RasterizerDummy::canvas_set_transform(const Matrix32& p_transform) {
 
 }
 
+void RasterizerDummy::canvas_render_items(CanvasItem *p_item_list) {
+
+
+}
+
 /* ENVIRONMENT */
 
 RID RasterizerDummy::environment_create() {