diff options
| author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2016-06-20 00:50:33 -0300 |
|---|---|---|
| committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2016-06-20 00:50:33 -0300 |
| commit | 0f1a717c643f3353ed75051e2f432aacdefe0ed0 (patch) | |
| tree | 8adf1694d1100897f4ee5e397983788033a24c7f /scene/2d | |
| parent | 00bc06b50bb1c688e6481ae8fbfab0a758b83dad (diff) | |
Remove unused connection. ShaderEditor should'nt handle ShaderGraphs.
Fixes #4678 && #4745
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/canvas_item.cpp | 17 | ||||
| -rw-r--r-- | scene/2d/canvas_item.h | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 8864459dfb..fa9b040d92 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -112,21 +112,9 @@ void CanvasItemMaterial::_get_property_list( List<PropertyInfo> *p_list) const { void CanvasItemMaterial::set_shader(const Ref<Shader>& p_shader) { ERR_FAIL_COND(p_shader.is_valid() && p_shader->get_mode()!=Shader::MODE_CANVAS_ITEM); -#ifdef TOOLS_ENABLED - if (shader.is_valid()) { - shader->disconnect("changed",this,"_shader_changed"); - } -#endif shader=p_shader; -#ifdef TOOLS_ENABLED - - if (shader.is_valid()) { - shader->connect("changed",this,"_shader_changed"); - } -#endif - RID rid; if (shader.is_valid()) rid=shader->get_rid(); @@ -151,11 +139,6 @@ Variant CanvasItemMaterial::get_shader_param(const StringName& p_param) const{ return VS::get_singleton()->canvas_item_material_get_shader_param(material,p_param); } -void CanvasItemMaterial::_shader_changed() { - - -} - RID CanvasItemMaterial::get_rid() const { return material; diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index d915f742ec..8b44e09857 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -60,7 +60,6 @@ protected: bool _get(const StringName& p_name,Variant &r_ret) const; void _get_property_list( List<PropertyInfo> *p_list) const; - void _shader_changed(); static void _bind_methods(); void get_argument_options(const StringName& p_function,int p_idx,List<String>*r_options) const; |