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, 7 insertions, 5 deletions

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index f88db9d..1b9084c 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -2,6 +2,7 @@ use kiss3d::conrod::{self, Borderable, Colorable, Labelable, Positionable, Sizea
 use kiss3d::window::Window;
 use rapier::dynamics::IntegrationParameters;
 
+use crate::harness::RunState;
 use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags};
 
 const SIDEBAR_W: f64 = 200.0;
@@ -98,6 +99,7 @@ impl TestbedUi {
         window: &mut Window,
         integration_parameters: &mut IntegrationParameters,
         state: &mut TestbedState,
+        run_state: &mut RunState,
     ) {
         let ui_root = window.conrod_ui().window;
         let mut ui = window.conrod_ui_mut().set_widgets();
@@ -254,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 = 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;
@@ -305,10 +307,10 @@ impl TestbedUi {
             .w_h(ELEMENT_W, ELEMENT_H)
             .set(self.ids.slider_num_threads, &mut ui)
             {
-                if state.num_threads != val as usize {
-                    state.num_threads = val as usize;
-                    state.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
-                        .num_threads(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();
                 }