Commit: 84e122e38a547cd57249f6d4da26bd722a93950e Author: Ray Molenkamp Date: Thu Oct 1 10:19:50 2020 -0600 Branches: master https://developer.blender.org/rB84e122e38a547cd57249f6d4da26bd722a93950e
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. =================================================================== M intern/cycles/graph/node_type.cpp =================================================================== 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); } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
