From af43e6465d451c77d52e73df8f2d2b2821895737 Mon Sep 17 00:00:00 2001
From: Erwin Coumans
 <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>
Date: Mon, 15 Jan 2018 15:13:11 -0800
Subject: [PATCH] fix wrong enum type

---
 data/multibody.bullet                         | Bin 18948 -> 16836 bytes
 .../PhysicsServerCommandProcessor.cpp         |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/multibody.bullet b/data/multibody.bullet
index 8d5019a7856d6654931c82c45f2ed89c0508bded..9f8e7ab893719b5d0e076f582540084391b20a3d 100644
GIT binary patch
delta 1247
zcmZpf!g!>avEC`v$Hz4!O}EU*!onro$0dV-fq@B%^?)=Z5YL(^Y0tpWU_Wc-OuNpG
z4jZ5l5G-&6iJd*;V+X<@5w7dXd(WOZV+&%>ni&bybHeG=C(lAIAYTM%5XjsHAO@KU
z1rztP+bJ9baeSRzA`5^t8x)5EX^=vof%_O392|g57-#@8pt!+)vLmB{sQW|@+pdld
z>ubSwVB0}1W175>Q8=Uos5TRb9fKSrH!w3Wumag291O%D_n?9Xpqm*OmK5v-T8RLt
ze4v$z%qc7&K_DZ92ib0*fXieBK^6{>1O5X6P#^##FmZ>}<N!uKR-g+Qn1N1~l!90V
z3_296K>W#yLc4*Ad3o}Mnr&bhXpk2>L=Ov)U9HFhGzo-Zz}Lyg*#H<|K&!zxZ1PhM
z^_)*EruJW0O!vc70onE-F&G~~!`y=&+7NMsIuHxH7|>Z}lkJ506tcPFVxbzq7J<`*
zgNz$Q3>bb}xLkNaZUu)1P&8~ZE4OAAc2l7SAyEjIUSBNWfRG?wKk+WT!UJ(BEVRQW
ztMZcL(rS@+NMTM3mww@M;pG6PXdYmIfUy2#SANZU;%x$jBP6dWH~=#|G{sP;f3h2+
zB6^YlSp>4lmH|0QhzK@;6arlivJ!%U(Uc&;b$ziluwb!)VPFmcE0`=G?85mv&;nfY
Va8HgE_GjdtycR@m{wvIG1_1Ng(5(Of

delta 2181
zcmX@o%-Ax8vEC`v$Hz4!MYqhz!onro$7Kft0|OHj>jG&;AT|br$M!%b5PYzQ@Gsj7
zg26<nI7F6#!NdW=`d~k6CJ3B_(=Zi4+Tmf<lKnthb-~P;JK+XE41NveM>>EMM%rn*
zO-xamT)@a<q;dc#0tUWLE|DjIEH)?(0n#9+0s+v(n;@fsfWu*OBBQuu1DM0WfJT3?
z2g*9czPxj5y@t?Adm*rI3hfvEj-Oq1YB}6d5X~R#L7{>SSb-c6R)GpS202DDutUT^
z;z2;n1hhd>=mXrWb?y(VMAlv34-}T*K;noofgK~k12gQyt1f<^A`vPGsEEKUf;yDp
zgQBFwWJBf_gIFE*l*2O%?7!a#{I@FdhW+cX&q7(9o9%H02~bm?*9ZImKmale6yVT6
z2OGVO<By($z-@aQZhbwu{U_nRp4I*1c+b*D`>ne3er#O$c>k);zMG7gZ|nyew?Kdy
zs1<~lX^SuifBI$z^tBvPh(Xg3B*c(8^-rK0gt=bKz52?@rldP->Qjvaa9hh9RKF}t
z@z}rbaV4Ld=|=l=r>DK|m3zD&>{K9eCZfBwi|e5M36*sTU8e+X{NAoIVdpi1%R|&D
z?19i<cZ2B#j8Hy9Jw&|XuQe>;Km<5o3K)8NuiU=7=aKyc!G_Pf&o}Ltf;b57Kqsh$
z7K*QX-m`ey+|XCy;YRX+Olr|%AN}6_SGLT1AGZ7E{xh-x3uKl&hdK~we;_N%-JQFS
z+pEkwS?9a&o%M(F2FizLltL9ioWsCS0CkW7loo(H5awVpXv&B1%i!__9GY*=06oyN
z^1Z;t*v0k=5C_@+UHS2nuW-@?2m^@*r4K7eYG;9252W|JQ<73<3x~TaVA-?Km7I?D
zyYxAmE^7qa2uL|q{`tKRlpQ4`&=V^xEdtGMn0$tXLlTxheVu%qIe?jx184&XhfjXX
zqHYkQP?a`s!83c?@D>maw-e?ZsJJ~$9nelSDMSVZDnl<npm|dbl10IkA#+|7Ob<HE
z!0@VPfhDNaf>{ZnAK1hAkW>sU^*Rnaz{DXmq#&4V!!9zJgH3@K<U?2%37>4rraAEe
z3zAE)yB?C`nLwrAK)K!o>~c^l0O9b-wd_Q>{Loj8nEpe5K}lhtTrM+t0fz+d31Fb}
z09_8k29u9+V7lH27V|(AD5-|U0a{_AB|dP>!jh2^Vcozm@PjLZDTmRBWCm0wp+H2M
z5}AC0vkX{`hQJ*TGYdw8Jpv?Pd;|^5d<RUb!O5z`9zwTZ&=5Dggr;+d=E)bhTsYqZ
ZTG)Zi=9(<a?a#<HITu83-pkEy1^{6WE^`0?

diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
index 7138b18ad..3ca3a8a54 100644
--- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
+++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
@@ -8217,7 +8217,7 @@ int PhysicsServerCommandProcessor::extractCollisionShapes(const btCollisionShape
 	case CONVEX_HULL_SHAPE_PROXYTYPE:
 	{
 		UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape);
-		if (urdfCol && (urdfCol->m_geometry.m_type == GEOM_MESH))
+		if (urdfCol && (urdfCol->m_geometry.m_type == URDF_GEOM_MESH))
 		{
 			collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH;
 			collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0];
@@ -8283,7 +8283,7 @@ int PhysicsServerCommandProcessor::extractCollisionShapes(const btCollisionShape
 	{
 		//it could be a compound mesh from a wavefront OBJ, check it
 		UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape);
-		if (urdfCol && (urdfCol->m_geometry.m_type == GEOM_MESH))
+		if (urdfCol && (urdfCol->m_geometry.m_type == URDF_GEOM_MESH))
 		{
 			collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH;
 			collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0];