Merge branch 'master' into split_geom

# Conflicts:
#	examples2d/sensor2.rs
#	examples3d/sensor3.rs
#	src/dynamics/integration_parameters.rs
#	src/dynamics/solver/parallel_island_solver.rs
#	src/dynamics/solver/velocity_constraint.rs
#	src/dynamics/solver/velocity_ground_constraint.rs
#	src_testbed/nphysics_backend.rs
#	src_testbed/physx_backend.rs
#	src_testbed/testbed.rs

1 files changed, 9 insertions, 3 deletions

diff --git a/examples2d/add_remove2.rs b/examples2d/add_remove2.rs
index a3d223d..0aeffbe 100644
--- a/examples2d/add_remove2.rs
+++ b/examples2d/add_remove2.rs
@@ -10,7 +10,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let rad = 0.5;
 
     // Callback that will be executed on the main loop to handle proximities.
-    testbed.add_callback(move |window, physics, _, graphics, _| {
+    testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
         let rigid_body = RigidBodyBuilder::new_dynamic()
             .translation(0.0, 10.0)
             .build();
@@ -19,7 +19,10 @@ pub fn init_world(testbed: &mut Testbed) {
         physics
             .colliders
             .insert(collider, handle, &mut physics.bodies);
-        graphics.add(window, handle, &physics.bodies, &physics.colliders);
+
+        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+            graphics.add(*window, handle, &physics.bodies, &physics.colliders);
+        }
 
         let to_remove: Vec<_> = physics
             .bodies
@@ -31,7 +34,10 @@ pub fn init_world(testbed: &mut Testbed) {
             physics
                 .bodies
                 .remove(handle, &mut physics.colliders, &mut physics.joints);
-            graphics.remove_body_nodes(window, handle);
+
+            if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+                graphics.remove_body_nodes(*window, handle);
+            }
         }
     });