Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/cycles/device/hip/queue.cpp2
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------source/tools0
4 files changed, 1 insertions, 1 deletions
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
-Subproject 75e46177f36a49ad36b917e641ee1586ddef709
+Subproject 80d9e7ee122c626cbbcd1da554683bce79f8d3d
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject f10ca8c156169b24e70027a43f718f99571d280
+Subproject e68c0118c13c3575e6096ad2dc7fb4434eadf38
diff --git a/source/tools b/source/tools
-Subproject 5061594ee62b8eabf705443a5483c7a1dfaa878
+Subproject 7c5acb95df918503d11cfc43172ce1390101928