Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

2017-02-22 13:00:22 +01:00
parent b0390221b5 096ea72fb6
commit d77f483871
1 changed files with 1 additions and 1 deletions
--- a/src/Nazara/Physics2D/PhysWorld2D.cpp
+++ b/src/Nazara/Physics2D/PhysWorld2D.cpp
@@ -72,7 +72,7 @@ namespace Nz
 	{
 		auto it = m_callbacks.emplace(handler, std::make_unique<Callback>(callbacks)).first;

-		handler->userData = &it->second;
+		handler->userData = it->second.get();

 		if (callbacks.startCallback)
 		{