diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 00:26:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 00:26:01 +0100 |
| commit | b7b39786840a41a057f531ed13b64e26366befac (patch) | |
| tree | b78a2e0bc0b3f49e82e148e8edb741930ff0ce55 /scene/3d/cpu_particles.h | |
| parent | e66d519286693a03bf59eaba0a5f29c1c9b15d64 (diff) | |
| parent | 18fbdbb456c07a56b358bea2e392765fbcbb3283 (diff) | |
Merge pull request #36556 from RandomShaper/rework_mutex
Reimplement `Mutex` with C++'s `<mutex>` (plus more)
Diffstat (limited to 'scene/3d/cpu_particles.h')
| -rw-r--r-- | scene/3d/cpu_particles.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/cpu_particles.h b/scene/3d/cpu_particles.h index 1a5537e4f2..231e1f1ad9 100644 --- a/scene/3d/cpu_particles.h +++ b/scene/3d/cpu_particles.h @@ -178,7 +178,7 @@ private: void _particles_process(float p_delta); void _update_particle_data_buffer(); - Mutex *update_mutex; + Mutex update_mutex; void _update_render_thread(); |