Merge branch 'master' of https://github.com/erwincoumans/bullet3

examples/SharedMemory/PhysicsClientUDP.cpp

@@ -187,6 +187,10 @@ struct	UdpNetworkedInternalData
 				printf("%s disconected.\n", m_event.peer->data);
 
 				break;
+			default:
+					{
+						printf("unknown event type: %d.\n", m_event.type);
+					}
 			}
 		}
 		else if (serviceResult > 0)
@@ -258,6 +262,10 @@ struct	UdpNetworkedInternalData
 
 				break;
 			}
+			default:
+				{
+					printf("unknown event type: %d.\n", m_event.type);
+				}
 			}
 		}
 		else if (serviceResult > 0)

examples/pybullet/pybullet.c

@@ -1497,7 +1497,7 @@ static PyObject* pybullet_resetVisualShapeData(PyObject* self, PyObject* args)
 static PyObject* pybullet_loadTexture(PyObject* self, PyObject* args)
 {
     int size = PySequence_Size(args);
-    const char* filename = -1;
+    const char* filename = 0;
     b3SharedMemoryCommandHandle commandHandle;
     b3SharedMemoryStatusHandle statusHandle;
     int statusType;