diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2020-01-16 04:21:32 +0300 |
---|---|---|
committer | Lukas Stockner <lukas.stockner@freenet.de> | 2020-01-16 04:21:32 +0300 |
commit | 7f571aad22724a1b0cb2427ee5e6829580050140 (patch) | |
tree | 331f0ed0de3b8c32449a5ac1b0d94aeb16f0cf91 /intern | |
parent | eca8bae6718d2cba788713bfb677f92f2fa3ca4e (diff) | |
parent | 7d8a186335400cb7ad69d24aab89e7a215a70348 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/mantaflow/intern/MANTA_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp index fc309c76b30..1980c11fe87 100644 --- a/intern/mantaflow/intern/MANTA_main.cpp +++ b/intern/mantaflow/intern/MANTA_main.cpp @@ -2621,7 +2621,7 @@ void MANTA::updatePointers() mantaFloatObjects.push_back(std::make_tuple( &mColorGHigh, "color_g" + noise_ext, func, mUsingSmoke & mUsingNoise & mUsingColors)); mantaFloatObjects.push_back(std::make_tuple( - &mColorRHigh, "color_b" + noise_ext, func, mUsingSmoke & mUsingNoise & mUsingColors)); + &mColorBHigh, "color_b" + noise_ext, func, mUsingSmoke & mUsingNoise & mUsingColors)); std::vector<std::tuple<std::vector<pData> **, std::string, std::string, bool>> mantaPDataObjects; mantaPDataObjects.push_back( |