diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-08-15 23:33:19 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-08-15 23:41:23 +0200 |
| commit | 3bb5abbc35b6690768f32db7becf874febc25713 (patch) | |
| tree | 0fbf0454b22009291426a829e709759cc2f2a7bb /scene/2d/canvas_item.h | |
| parent | a4f9c95169579d650d6189d5034fb417bcc518af (diff) | |
Let TileMap apply its material
So when a material is set, every tile will be rendered with that. Quadrants will not be recreated, so a `CanvasItem` will exist per material per quadrant regardless a global material is set.
This makes also __Use parent material__ work for `TileMap`s.
Closes #9996.
Diffstat (limited to 'scene/2d/canvas_item.h')
| -rw-r--r-- | scene/2d/canvas_item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index 27842727ac..933b135070 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -291,10 +291,10 @@ public: RID get_canvas() const; Ref<World2D> get_world_2d() const; - void set_material(const Ref<Material> &p_material); + virtual void set_material(const Ref<Material> &p_material); Ref<Material> get_material() const; - void set_use_parent_material(bool p_use_parent_material); + virtual void set_use_parent_material(bool p_use_parent_material); bool get_use_parent_material() const; Ref<InputEvent> make_input_local(const Ref<InputEvent> &pevent) const; |