Merge branch 'master' into physics3d-material

2018-01-14 14:40:57 +01:00
parent 18a4099958 0b2d5b9332
commit 4cb598c32b
320 changed files with 130259 additions and 277 deletions
--- a/SDK/src/NDK/Components/CollisionComponent3D.cpp
+++ b/SDK/src/NDK/Components/CollisionComponent3D.cpp
@@ -32,7 +32,7 @@ namespace Ndk
 		{
 			// We update the geometry of the PhysiscsObject linked to the PhysicsComponent3D
 			PhysicsComponent3D& physComponent = m_entity->GetComponent<PhysicsComponent3D>();
-			physComponent.GetRigidBody().SetGeom(m_geom);
+			physComponent.GetRigidBody()->SetGeom(m_geom);
 		}
 		else
 		{