LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-06 03:48:48 -03:00
parent dcd6365356 e751278af1
commit b5f2bce0a6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/World.cpp
+10 -7
View File
@@ -568,6 +568,16 @@ void World::destroy()
return; return;
} }
// Remove userdata reference to avoid it sticking around after GC
if (begin.ref) begin.ref->unref();
if (end.ref) end.ref->unref();
if (presolve.ref) presolve.ref->unref();
if (postsolve.ref) postsolve.ref->unref();
if (filter.ref) filter.ref->unref();
//disable callbacks
begin.ref = end.ref = presolve.ref = postsolve.ref = filter.ref = nullptr;
// Cleaning up the world. // Cleaning up the world.
b2Body *b = world->GetBodyList(); b2Body *b = world->GetBodyList();
while (b) while (b)
@@ -585,13 +595,6 @@ void World::destroy()
world->DestroyBody(groundBody); world->DestroyBody(groundBody);
Memoizer::remove(world); Memoizer::remove(world);
// Remove userdata reference to avoid it sticking around after GC
if (begin.ref) begin.ref->unref();
if (end.ref) end.ref->unref();
if (presolve.ref) presolve.ref->unref();
if (postsolve.ref) postsolve.ref->unref();
if (filter.ref) filter.ref->unref();
delete world; delete world;
world = nullptr; world = nullptr;
} }