diff --git a/data/multibody.bullet b/data/multibody.bullet index 0dee8f14a..b071e4eb7 100644 Binary files a/data/multibody.bullet and b/data/multibody.bullet differ diff --git a/examples/ExampleBrowser/OpenGLGuiHelper.cpp b/examples/ExampleBrowser/OpenGLGuiHelper.cpp index 49b717b5a..daeefddc6 100644 --- a/examples/ExampleBrowser/OpenGLGuiHelper.cpp +++ b/examples/ExampleBrowser/OpenGLGuiHelper.cpp @@ -292,10 +292,10 @@ int OpenGLGuiHelper::registerTexture(const unsigned char* texels, int width, int return textureId; } -void OpenGLGuiHelper::changeTexture(int textureUniqueId, const unsigned char* texels, int width, int height) +void OpenGLGuiHelper::changeTexture(int textureUniqueId, const unsigned char* rgbTexels, int width, int height) { bool flipPixelsY = true; - m_data->m_glApp->m_renderer->updateTexture(textureUniqueId, texels,flipPixelsY); + m_data->m_glApp->m_renderer->updateTexture(textureUniqueId, rgbTexels,flipPixelsY); } diff --git a/examples/OpenGLWindow/GLInstancingRenderer.cpp b/examples/OpenGLWindow/GLInstancingRenderer.cpp index 7b0c617ed..c00f41be4 100644 --- a/examples/OpenGLWindow/GLInstancingRenderer.cpp +++ b/examples/OpenGLWindow/GLInstancingRenderer.cpp @@ -1440,8 +1440,8 @@ void GLInstancingRenderer::updateCamera(int upAxis) -////#define STB_IMAGE_WRITE_IMPLEMENTATION -#include "third_party/stblib/stb_image_write.h" +//#define STB_IMAGE_WRITE_IMPLEMENTATION +#include "stb_image/stb_image_write.h" void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents) { diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c index 4cf3eb6ac..637899e6c 100644 --- a/examples/pybullet/pybullet.c +++ b/examples/pybullet/pybullet.c @@ -4651,11 +4651,6 @@ static PyObject* pybullet_loadTexture(PyObject* self, PyObject* args, PyObject* item = PyInt_FromLong(b3GetStatusTextureUniqueId(statusHandle)); return item; } - else - { - PyErr_SetString(SpamError, "Error loading texture"); - return NULL; - } } PyErr_SetString(SpamError, "Error loading texture");