Merge branch 'master' into infinite_fall_memory

Fix merge conflict resulting from "axii" spelling correction

1 files changed, 4 insertions, 0 deletions

diff --git a/examples3d/all_examples3.rs b/examples3d/all_examples3.rs
index 64eb5b6..eeb9736 100644
--- a/examples3d/all_examples3.rs
+++ b/examples3d/all_examples3.rs
@@ -11,8 +11,10 @@ use rapier_testbed3d::Testbed;
 use std::cmp::Ordering;
 
 mod add_remove3;
+mod collision_groups3;
 mod compound3;
 mod debug_boxes3;
+mod debug_cylinder3;
 mod debug_triangle3;
 mod debug_trimesh3;
 mod domino3;
@@ -64,6 +66,7 @@ pub fn main() {
     let mut builders: Vec<(_, fn(&mut Testbed))> = vec![
         ("Add remove", add_remove3::init_world),
         ("Primitives", primitives3::init_world),
+        ("Collision groups", collision_groups3::init_world),
         ("Compound", compound3::init_world),
         ("Domino", domino3::init_world),
         ("Heightfield", heightfield3::init_world),
@@ -76,6 +79,7 @@ pub fn main() {
         ("(Debug) boxes", debug_boxes3::init_world),
         ("(Debug) triangle", debug_triangle3::init_world),
         ("(Debug) trimesh", debug_trimesh3::init_world),
+        ("(Debug) cylinder", debug_cylinder3::init_world),
     ];
 
     // Lexicographic sort, with stress tests moved at the end of the list.