Merge branch '3.8' into 3.9-beta

This commit is contained in:
badlogic 2020-06-03 13:28:37 +02:00
commit f8455ac5c9
2 changed files with 8 additions and 0 deletions

View File

@ -61,6 +61,11 @@ public:
getInstance()->_free((void *) ptr, file, line);
}
template<typename T>
static void beforeFree(T *ptr) {
getInstance()->_beforeFree((void *) ptr);
}
static char *readFile(const String &path, int *length) {
return getInstance()->_readFile(path, length);
}
@ -83,6 +88,8 @@ public:
virtual char *_readFile(const String &path, int *length) = 0;
virtual void _beforeFree(void *ptr) { SP_UNUSED(ptr); }
protected:
SpineExtension();

View File

@ -63,4 +63,5 @@ void SpineObject::operator delete(void *p) {
}
SpineObject::~SpineObject() {
SpineExtension::beforeFree(this);
}