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
path: root/intern
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-10-01 19:19:50 +0300
committerRay Molenkamp <github@lazydodo.com>2020-10-01 19:19:50 +0300
commit84e122e38a547cd57249f6d4da26bd722a93950e (patch)
tree0ec79378069b2e7f166159abf2afef9302aa2eb6 /intern
parentec723ad25c70994ac24b528384ee9df927a3e850 (diff)
Cycles: Fix broken 32 bit shift.
1ul << n will still be a 32 bit integer regardless of the value of n, given the target here is 64 bits the upper 32 bits will always be zero. Using 1ull will yield the expected result.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/graph/node_type.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/graph/node_type.cpp b/intern/cycles/graph/node_type.cpp
index 0ec421023a2..2b11af70d71 100644
--- a/intern/cycles/graph/node_type.cpp
+++ b/intern/cycles/graph/node_type.cpp
@@ -168,7 +168,7 @@ void NodeType::register_input(ustring name,
socket.node_type = node_type;
socket.flags = flags | extra_flags;
assert(inputs.size() < std::numeric_limits<SocketModifiedFlags>::digits);
- socket.modified_flag_bit = (1ul << inputs.size());
+ socket.modified_flag_bit = (1ull << inputs.size());
inputs.push_back(socket);
}