diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
| commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
| tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /extern/mantaflow/preprocessed/noisefield.cpp | |
| parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
| parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) | |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'extern/mantaflow/preprocessed/noisefield.cpp')
| -rw-r--r-- | extern/mantaflow/preprocessed/noisefield.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/mantaflow/preprocessed/noisefield.cpp b/extern/mantaflow/preprocessed/noisefield.cpp index 98a92309b05..bf4a5952d02 100644 --- a/extern/mantaflow/preprocessed/noisefield.cpp +++ b/extern/mantaflow/preprocessed/noisefield.cpp @@ -34,7 +34,7 @@ using namespace std; namespace Manta { int WaveletNoiseField::randomSeed = 13322223; -Real *WaveletNoiseField::mNoiseTile = NULL; +Real *WaveletNoiseField::mNoiseTile = nullptr; std::atomic<int> WaveletNoiseField::mNoiseReferenceCount(0); static Real _aCoeffs[32] = { |