From 9cf747b35b6140c1000a4a55c9f79fc9bce93e42 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@google.com>
Date: Sat, 1 Jul 2017 10:01:55 -0700
Subject: [PATCH] a few compile/warning fixes

---
 data/multibody.bullet                         | Bin 14844 -> 14844 bytes
 examples/ExampleBrowser/OpenGLGuiHelper.cpp   |   4 ++--
 .../OpenGLWindow/GLInstancingRenderer.cpp     |   4 ++--
 examples/pybullet/pybullet.c                  |   5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/data/multibody.bullet b/data/multibody.bullet
index 0dee8f14afc067fbc54030a22bd9941df44f6edd..b071e4eb732e8af9e2708912d4ed2875df2e1bb5 100644
GIT binary patch
delta 487
zcmexU{HJ)rmdPTVHWNS8OfFz$$z=e80}c=xL~6m94<@KG+Dxx!U~p)^&%_86<$}pT
zX=XUT!JdHugdt!_!QOo!7T5K~wg|exo^kR-CUK3|LI;X}vNLShBm$-%_%T3CXJCN1
zBJW$hz0b=E>&Y@qYJ3a~kF6W*r!I-N7i90TnmmEUWby_^mWd@olMPs;SV0b8o;;C7
ze)0__<@yH<>JaxvR6$L26EvS*@66x^G|^?jV(axH?R!A(`S)$b?$5vL?PujFg88wl
z+iWDxD%rgFTo3lcKg$ODD+l83b#|9qfz%VH-wd|_b;8}df9z(o{aPXdw(w|xk)5Y=
zw2k-b&3h+rU{*2Mu!jL0(jePF0GZDN<o|~PP%K<LbH;9R3bV%K39Jf}eOUOI7#KFk
Ruy`=Df;2L0UdbM81OUDlk1GHG

delta 467
zcmexU{HJ)r7FI3>1_tiQ6Im=LeyTD7vNr=U7~I$#YybcMe>*65OG;YWJ}8?3CJt1y
ze{uqohy_S7OcF#dDcB2F4B{{3JO|?2zX&?IS8?}ryR@`4`&lz*+D*J5CdI%|;eH4x
z+hEVY2!u#rvJ8`&`X;!*hJOncLGlK_7b=1T7kr2CD`uTxV4VDrQJD7uR7JvGpv+`N
z7Ht7$pgIs{0b-!5|4-h)A~yLJlcFd?*-r*rpdf?N^Rj&l@~7^ykau;MY``kw020jR
zj*A7+AaEdd0oYmy50#$+6a*Oy0x+jfW?|7_1qt|04&+dtyoFi82dvc+Y5<V_|6kOZ
zfg!>SC}Ii`H8Y2Z!T1mwD#q|Yec65{<9+)<Zl2u8sx#S#g^x+$;N}<>4`$X44}qTD
JyplcG2mk<Fc$NSF

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");