From 1138103c6374bee84680bfe85ff794191365e33a Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho
Date: Fri, 27 Nov 2015 21:11:20 -0300
Subject: Fix shader loading, making possible load .shd and .sgp from editor

---
 scene/resources/material.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scene/resources/material.cpp')

diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 55bb4e907..b4ea60cb8 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -535,6 +535,8 @@ void ShaderMaterial::_shader_changed() {
 
 void ShaderMaterial::set_shader(const Ref<Shader>& p_shader) {
 
+	ERR_FAIL_COND(p_shader.is_valid() && p_shader->get_mode()!=Shader::MODE_MATERIAL);
+
 	if (shader.is_valid())
 		shader->disconnect(SceneStringNames::get_singleton()->changed,this,SceneStringNames::get_singleton()->_shader_changed);
 	shader=p_shader;
-- 
cgit v1.3.1