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

Former-commit-id: 134fa30aa845733a5aadc337a74a026826a94584 [formerly 0b712d4a6ff3a258cb9bf6d094779bef95aba691] [formerly a4943d6b11693fbf7118a4af1ec54a2ba3b6ead2 [formerly cd55d7c59bf21e119d99c785511768d2ab1b33f0]]
Former-commit-id: b1e9df653da05a8078b6e9f6c6775bad5287fd90 [formerly 2d3f2d6be34b92fb90c8a0f86c5c47e8e058f9aa]
Former-commit-id: b7f822205809c80a20036bb95ecabb6acb029049
This commit is contained in:
Lynix 2016-09-06 13:31:13 +02:00
commit 0062a312a7
1 changed files with 1 additions and 1 deletions

View File

@ -139,7 +139,7 @@ namespace Ndk
#ifndef NDK_SERVER
/*********************************** Ndk::GraphicsComponent **********************************/
graphicsComponent.BindMethod("Attach", &GraphicsComponent::Attach, 0);
graphicsComponent.BindMethod("Attach", (void(Ndk::GraphicsComponent::*)(Nz::InstancedRenderableRef, int)) &GraphicsComponent::Attach, 0);
#endif