godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

Merge pull request #38388 from mashumafi/3.2-tileset-use-path

Browse Source 
TileSet use texture Path instead of RID to prevent name conflicts.
This commit is contained in:
Rémi Verschelde
2021-02-18 22:36:23 +01:00
committed by GitHub
parent 001aaa7131 6211285fbd
commit 48936dda8a
2 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/tile_set_editor_plugin.h
View File

@@ -114,7 +114,7 @@ class TileSetEditor : public HSplitContainer {
int option;
ToolButton *tileset_toolbar_buttons[TOOL_TILESET_MAX];
MenuButton *tileset_toolbar_tools;
Map<RID, Ref<Texture> > texture_map;
Map<String, Ref<Texture> > texture_map;
bool creating_shape;
int dragging_point;