diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-20 09:39:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 09:39:29 +0200 |
| commit | 4fcc5891450a7dca9c8ebae6ff3765f5f060c442 (patch) | |
| tree | d10b935e7a77774960fefd93ac306db447cc2bfd /servers/text_server.cpp | |
| parent | 60dcc4f39c0e6289dba691225c002cd6e77be6ba (diff) | |
| parent | e28fd07b2bbe78db0f286604a6eb469d8a0664be (diff) | |
Merge pull request #49693 from LightningAA/instance-is-not-a-verb
Rename `instance()`->`instantiate()` when it's a verb
Diffstat (limited to 'servers/text_server.cpp')
| -rw-r--r-- | servers/text_server.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/text_server.cpp b/servers/text_server.cpp index daed612b02..6f48148cab 100644 --- a/servers/text_server.cpp +++ b/servers/text_server.cpp @@ -466,16 +466,16 @@ void TextServer::initialize_hex_code_box_fonts() { Vector<uint8_t> hex_box_data; Ref<Image> image; - image.instance(); + image.instantiate(); Ref<ImageTexture> hex_code_image_tex[2]; hex_box_data.resize(tamsyn5x9_png_len); memcpy(hex_box_data.ptrw(), tamsyn5x9_png, tamsyn5x9_png_len); image->load_png_from_buffer(hex_box_data); - hex_code_image_tex[0].instance(); + hex_code_image_tex[0].instantiate(); hex_code_image_tex[0]->create_from_image(image); - hex_code_box_font_tex[0].instance(); + hex_code_box_font_tex[0].instantiate(); hex_code_box_font_tex[0]->set_diffuse_texture(hex_code_image_tex[0]); hex_code_box_font_tex[0]->set_texture_filter(CanvasItem::TEXTURE_FILTER_NEAREST); hex_box_data.clear(); @@ -483,9 +483,9 @@ void TextServer::initialize_hex_code_box_fonts() { hex_box_data.resize(tamsyn10x20_png_len); memcpy(hex_box_data.ptrw(), tamsyn10x20_png, tamsyn10x20_png_len); image->load_png_from_buffer(hex_box_data); - hex_code_image_tex[1].instance(); + hex_code_image_tex[1].instantiate(); hex_code_image_tex[1]->create_from_image(image); - hex_code_box_font_tex[1].instance(); + hex_code_box_font_tex[1].instantiate(); hex_code_box_font_tex[1]->set_diffuse_texture(hex_code_image_tex[1]); hex_code_box_font_tex[1]->set_texture_filter(CanvasItem::TEXTURE_FILTER_NEAREST); hex_box_data.clear(); |