diff --git a/external/bullet/lutin_bullet.py b/external/bullet/lutin_bullet.py index ccf2fc83..8850c97a 100644 --- a/external/bullet/lutin_bullet.py +++ b/external/bullet/lutin_bullet.py @@ -39,6 +39,8 @@ def create(target): 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp', 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp', 'bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp', 'bullet/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp', 'bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp', 'bullet/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp', diff --git a/external/ege b/external/ege index ba20ab59..73455cc6 160000 --- a/external/ege +++ b/external/ege @@ -1 +1 @@ -Subproject commit ba20ab59f74866367fb8efa260fc6eb26889422b +Subproject commit 73455cc61be78fd2a76466fb8c6a1aaabe68bf61 diff --git a/external/etk b/external/etk index 3cf514f7..6bb7f2e9 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 3cf514f7c7b00abe6a262e41a0847afc12ded207 +Subproject commit 6bb7f2e911a42e62839a8c2795d0196490c0e088 diff --git a/sources/ewol/resource/Program.cpp b/sources/ewol/resource/Program.cpp index 508420eb..bd5974ff 100644 --- a/sources/ewol/resource/Program.cpp +++ b/sources/ewol/resource/Program.cpp @@ -327,7 +327,7 @@ void ewol::resource::Program::sendAttribute(int32_t _idElem, void ewol::resource::Program::sendAttributePointer(int32_t _idElem, int32_t _nbElement, - ewol::resource::VirtualBufferObject* _vbo, + const ewol::object::Shared& _vbo, int32_t _index, int32_t _jumpBetweenSample, int32_t _offset) { diff --git a/sources/ewol/resource/Program.h b/sources/ewol/resource/Program.h index 0d877060..ca7d0cb2 100644 --- a/sources/ewol/resource/Program.h +++ b/sources/ewol/resource/Program.h @@ -86,7 +86,7 @@ namespace ewol { int32_t _jumpBetweenSample=0); void sendAttributePointer(int32_t _idElem, int32_t _nbElement, - ewol::resource::VirtualBufferObject* _vbo, + const ewol::object::Shared& _vbo, int32_t _index, int32_t _jumpBetweenSample=0, int32_t _offset=0);