diff options
| author | Juan Linietsky | 2018-02-21 09:38:21 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2018-02-21 09:39:09 -0300 |
| commit | 9e3a1e5401f9f807085547de0ecc3f527610daa4 (patch) | |
| tree | ac58cd4f27e9dfe8ed550dfce9bfc442f29cd05a /servers/visual/visual_server_canvas.cpp | |
| parent | 1c77fdcc8516cf2f0c5083d4840a684b9ad90958 (diff) | |
| download | godot-9e3a1e5401f9f807085547de0ecc3f527610daa4.tar.gz godot-9e3a1e5401f9f807085547de0ecc3f527610daa4.tar.zst godot-9e3a1e5401f9f807085547de0ecc3f527610daa4.zip | |
Diffstat (limited to 'servers/visual/visual_server_canvas.cpp')
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index d82d93a59..330b2bd0d 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -742,7 +742,7 @@ void VisualServerCanvas::canvas_item_add_set_transform(RID p_item, const Transfo canvas_item->commands.push_back(tr); } -void VisualServerCanvas::canvas_item_add_mesh(RID p_item, const RID &p_mesh, RID p_skeleton) { +void VisualServerCanvas::canvas_item_add_mesh(RID p_item, const RID &p_mesh, RID p_texture, RID p_normal_map, RID p_skeleton) { Item *canvas_item = canvas_item_owner.getornull(p_item); ERR_FAIL_COND(!canvas_item); @@ -750,6 +750,8 @@ void VisualServerCanvas::canvas_item_add_mesh(RID p_item, const RID &p_mesh, RID Item::CommandMesh *m = memnew(Item::CommandMesh); ERR_FAIL_COND(!m); m->mesh = p_mesh; + m->texture = p_texture; + m->normal_map = p_normal_map; m->skeleton = p_skeleton; canvas_item->commands.push_back(m); @@ -774,7 +776,7 @@ void VisualServerCanvas::canvas_item_add_particles(RID p_item, RID p_particles, canvas_item->commands.push_back(part); } -void VisualServerCanvas::canvas_item_add_multimesh(RID p_item, RID p_mesh, RID p_skeleton) { +void VisualServerCanvas::canvas_item_add_multimesh(RID p_item, RID p_mesh, RID p_texture, RID p_normal_map, RID p_skeleton) { Item *canvas_item = canvas_item_owner.getornull(p_item); ERR_FAIL_COND(!canvas_item); @@ -783,6 +785,8 @@ void VisualServerCanvas::canvas_item_add_multimesh(RID p_item, RID p_mesh, RID p ERR_FAIL_COND(!mm); mm->multimesh = p_mesh; mm->skeleton = p_skeleton; + mm->texture = p_texture; + mm->normal_map = p_normal_map; canvas_item->rect_dirty = true; canvas_item->commands.push_back(mm); |
