From 8ef1c41a4e20602ee1c65a64b1cd5b15e204dfb1 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Fri, 23 Jun 2017 14:31:21 -0300
Subject: Small fixes required to get platformer to work. Added back
 CanvasItemMaterial

---
 scene/register_scene_types.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scene/register_scene_types.cpp')

diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index d4ca55346a..69d1a3aeb8 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -469,6 +469,9 @@ void register_scene_types() {
 	ClassDB::register_class<Shader>();
 	ClassDB::register_class<ShaderMaterial>();
 	ClassDB::register_virtual_class<CanvasItem>();
+	ClassDB::register_class<CanvasItemMaterial>();
+	SceneTree::add_idle_callback(CanvasItemMaterial::flush_changes);
+	CanvasItemMaterial::init_shaders();
 	ClassDB::register_class<Node2D>();
 	ClassDB::register_class<Particles2D>();
 	//ClassDB::register_class<ParticleAttractor2D>();
@@ -663,5 +666,6 @@ void unregister_scene_types() {
 
 	SpatialMaterial::finish_shaders();
 	ParticlesMaterial::finish_shaders();
+	CanvasItemMaterial::finish_shaders();
 	SceneStringNames::free();
 }
-- 
cgit v1.2.3