seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-fixed issue with shader not being reset on layers, closes #1199

Browse Source 
-ability for shader to use parent shader and params, closes #1198
This commit is contained in:
Juan Linietsky
2015-01-12 20:44:02 -03:00
parent 544ce2a1db
commit 30d3658110
11 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/2d/canvas_item.h
View File

@ -81,6 +81,7 @@ private:
bool block_transform_notify;
bool behind;
bool use_parent_shader;
Ref<Shader> shader;
mutable Matrix32 global_transform;
@ -214,6 +215,9 @@ public:
void set_shader(const Ref<Shader>& p_shader);
Ref<Shader> get_shader() const;
void set_use_parent_shader(bool p_use_parent_shader);
bool get_use_parent_shader() const;
void set_shader_param(const StringName& p_param,const Variant& p_value);
Variant get_shader_param(const StringName& p_param) const;