Merge branch 'master' into culling

SDK/include/NDK/Components/GraphicsComponent.hpp

@@ -77,21 +77,21 @@ namespace Ndk
 				dataUpdated(false)
 				{
 				}
-				
-				Renderable(Renderable&& renderable) noexcept :
-				renderableBoundingVolumeInvalidationSlot(std::move(renderable.renderableBoundingVolumeInvalidationSlot)),
-				renderableDataInvalidationSlot(std::move(renderable.renderableDataInvalidationSlot)),
-				renderableReleaseSlot(std::move(renderable.renderableReleaseSlot)),
-				data(std::move(renderable.data)),
-				renderable(std::move(renderable.renderable)),
-				dataUpdated(renderable.dataUpdated)
+
+				Renderable(Renderable&& rhs) noexcept :
+				renderableBoundingVolumeInvalidationSlot(std::move(rhs.renderableBoundingVolumeInvalidationSlot)),
+				renderableDataInvalidationSlot(std::move(rhs.renderableDataInvalidationSlot)),
+				renderableReleaseSlot(std::move(rhs.renderableReleaseSlot)),
+				data(std::move(rhs.data)),
+				renderable(std::move(rhs.rhs)),
+				dataUpdated(rhs.dataUpdated)
 				{
 				}
 
 				~Renderable()
 				{
 					// Disconnect release slot before releasing instanced renderable reference
-					renderableReleaseSlot.Disconnect(); 
+					renderableReleaseSlot.Disconnect();
 				}
 
 				Renderable& operator=(Renderable&& r) noexcept
@@ -136,4 +136,4 @@ namespace Ndk
 #include <NDK/Components/GraphicsComponent.inl>
 
 #endif // NDK_COMPONENTS_GRAPHICSCOMPONENT_HPP
-#endif // NDK_SERVER
+#endif // NDK_SERVER

SDK/include/NDK/Components/VelocityComponent.hpp

@@ -12,7 +12,6 @@
 
 namespace Ndk
 {
-	class Entity;
 	class VelocityComponent;
 
 	using VelocityComponentHandle = Nz::ObjectHandle<VelocityComponent>;