diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
| commit | 1445b6806b8a359594b1789726aa87d64b279286 (patch) | |
| tree | 26928a4ed18cfcc7b434a17bff7d7488aa8b32ef /servers/visual/visual_server_wrap_mt.h | |
| parent | c0d363266755de3ac87f61600f23921d881d99e2 (diff) | |
| parent | 30d36581100f0bf71c6d2502be9a03443bdf8708 (diff) | |
Merge branch 'master' into x11-window-management
Diffstat (limited to 'servers/visual/visual_server_wrap_mt.h')
| -rw-r--r-- | servers/visual/visual_server_wrap_mt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 300aba4551..c344161445 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -1136,6 +1136,9 @@ public: FUNC2(canvas_item_set_shader,RID, RID ); FUNC1RC(RID,canvas_item_get_shader,RID ); + FUNC2(canvas_item_set_use_parent_shader,RID, bool ); + + FUNC3(canvas_item_set_shader_param,RID,const StringName&,const Variant&); FUNC2RC(Variant,canvas_item_get_shader_param,RID,const StringName&); |