[Bf-blender-cvs] [f0df0e9e07f] master: Fix: Add cast to atof for CYCLES_CONCURRENT_STATES_FACTOR env variable parsing.

[William Leeson]

Commit: f0df0e9e07f9e0c8534cc77262cca9bae97ea618
Author: William Leeson
Date:   Wed Oct 20 20:51:56 2021 +0200
Branches: master
https://developer.blender.org/rBf0df0e9e07f9e0c8534cc77262cca9bae97ea618

Fix: Add cast to atof for CYCLES_CONCURRENT_STATES_FACTOR env variable parsing.

The conversion from double to float was causing a build failure.

Differential Revision: https://developer.blender.org/D12946

===================================================================

M	intern/cycles/device/hip/queue.cpp
M	release/datafiles/locale
M	release/scripts/addons
M	source/tools

===================================================================

diff --git a/intern/cycles/device/hip/queue.cpp b/intern/cycles/device/hip/queue.cpp
index 0d9f5916d30..6cb29670f94 100644
--- a/intern/cycles/device/hip/queue.cpp
+++ b/intern/cycles/device/hip/queue.cpp
@@ -53,7 +53,7 @@ int HIPDeviceQueue::num_concurrent_states(const size_t state_size) const
 
   const char *factor_str = getenv("CYCLES_CONCURRENT_STATES_FACTOR");
   if (factor_str) {
-    float factor = atof(factor_str);
+    float factor = (float)atof(factor_str);
     if (!factor)
       VLOG(3) << "CYCLES_CONCURRENT_STATES_FACTOR evaluated to 0";
     num_states = max((int)(num_states * factor), 1024);
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 75e46177f36..80d9e7ee122 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 75e46177f36a49ad36b917e641ee1586ddef7092
+Subproject commit 80d9e7ee122c626cbbcd1da554683bce79f8d3df
diff --git a/release/scripts/addons b/release/scripts/addons
index f10ca8c1561..e68c0118c13 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f10ca8c156169b24e70027a43f718f99571d280f
+Subproject commit e68c0118c13c3575e6096ad2dc7fb4434eadf38e
diff --git a/source/tools b/source/tools
index 5061594ee62..7c5acb95df9 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 5061594ee62b8eabf705443a5483c7a1dfaa8789
+Subproject commit 7c5acb95df918503d11cfc43172ce13901019289