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

Merge pull request #30622 from creikey/fix-path-caching

Browse Source 
PackedScene resources are freed before they are saved
This commit is contained in:
Rémi Verschelde
2019-10-21 13:53:45 +02:00
committed by GitHub
parent 119bf23720 b3cb58e7b3
commit 28eca3649d
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/resource.h
View File

@ -84,9 +84,7 @@ protected:
void _set_path(const String &p_path);
void _take_over_path(const String &p_path);
#ifdef TOOLS_ENABLED
Map<String, int> id_for_path;
#endif
public:
static Node *(*_get_local_scene_func)(); //used by editor
@ -152,6 +150,10 @@ class ResourceCache {
friend class ResourceLoader; //need the lock
static RWLock *lock;
static HashMap<String, Resource *> resources;
#ifdef TOOLS_ENABLED
static HashMap<String, HashMap<String, int> > resource_path_cache; // each tscn has a set of resource paths and IDs
static RWLock *path_cache_lock;
#endif // TOOLS_ENABLED
friend void unregister_core_types();
static void clear();
friend void register_core_types();