Merge branch 'master' into physics3d-material

This commit is contained in:
Lynix
2018-01-14 14:40:57 +01:00
320 changed files with 130259 additions and 277 deletions

View File

@@ -64,7 +64,7 @@ namespace Ndk
private:
void ApplyPhysicsState(Nz::RigidBody3D& rigidBody) const;
void CopyPhysicsState(const Nz::RigidBody3D& rigidBody);
Nz::RigidBody3D& GetRigidBody();
Nz::RigidBody3D* GetRigidBody();
const Nz::RigidBody3D& GetRigidBody() const;
void OnAttached() override;