From 99c2184e134b40cca9cb22fe93a95a64295ae048 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Fri, 22 Jan 2021 16:33:31 +0100
Subject: Fix regressions introduced by the merge with master.

---
 src_testbed/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 1b9084c..4c511f2 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -99,7 +99,7 @@ impl TestbedUi {
         window: &mut Window,
         integration_parameters: &mut IntegrationParameters,
         state: &mut TestbedState,
-        run_state: &mut RunState,
+        _run_state: &mut RunState,
     ) {
         let ui_root = window.conrod_ui().window;
         let mut ui = window.conrod_ui_mut().set_widgets();
-- 
cgit 


From b779eb261e7c3e816c8b586f1f496dcd17dbf700 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Fri, 22 Jan 2021 16:43:16 +0100
Subject: Fix compilation in 2D.

---
 src_testbed/ui.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 4c511f2..6a323d8 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -256,7 +256,7 @@ impl TestbedUi {
         let curr_vel_iters = integration_parameters.max_velocity_iterations;
         let curr_pos_iters = integration_parameters.max_position_iterations;
         #[cfg(feature = "parallel")]
-        let curr_num_threads = run_state.num_threads;
+        let curr_num_threads = _run_state.num_threads;
         let curr_max_ccd_substeps = integration_parameters.max_ccd_substeps;
         let curr_min_island_size = integration_parameters.min_island_size;
         let curr_warmstart_coeff = integration_parameters.warmstart_coeff;
@@ -307,10 +307,10 @@ impl TestbedUi {
             .w_h(ELEMENT_W, ELEMENT_H)
             .set(self.ids.slider_num_threads, &mut ui)
             {
-                if run_state.num_threads != val as usize {
-                    run_state.num_threads = val as usize;
-                    run_state.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
-                        .num_threads(run_state.num_threads)
+                if _run_state.num_threads != val as usize {
+                    _run_state.num_threads = val as usize;
+                    _run_state.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
+                        .num_threads(_run_state.num_threads)
                         .build()
                         .unwrap();
                 }
-- 
cgit 


From 90db26eb501b65cda362dcef34777106f533248b Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Sat, 23 Jan 2021 13:34:03 +0100
Subject: Fix warnings in tests and testbed.

---
 src_testbed/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 6a323d8..43cdf17 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -137,7 +137,7 @@ impl TestbedUi {
             .set(self.ids.backends_list, &mut ui)
             {
                 if selected != state.selected_backend {
-                    #[cfg(feature = "dim3")]
+                    #[cfg(all(feature = "dim3", feature = "other-backends"))]
                     fn is_physx(id: usize) -> bool {
                         id == crate::testbed::PHYSX_BACKEND_PATCH_FRICTION
                             || id == crate::testbed::PHYSX_BACKEND_TWO_FRICTION_DIR
-- 
cgit