[Bf-blender-cvs] [3e86cfa1ffd] blender2.8: depsgraph: re-Fix 32 bit shift bug in get_visible_components_mask.

Ray Molenkamp noreply at git.blender.org
Tue Sep 25 18:13:04 CEST 2018


Commit: 3e86cfa1ffd9f11a9820c5871b603c8d01218356
Author: Ray Molenkamp
Date:   Tue Sep 25 10:12:23 2018 -0600
Branches: blender2.8
https://developer.blender.org/rB3e86cfa1ffd9f11a9820c5871b603c8d01218356

depsgraph: re-Fix 32 bit shift bug in get_visible_components_mask.

1UL << n still results in a 32 bit result, 1ULL << n actually retains all 64 bits.

fixes stupid typo in rBbd51cada8db64e45cabca66cd61438c1ae2bdf25

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

M	source/blender/depsgraph/intern/nodes/deg_node_id.cc

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

diff --git a/source/blender/depsgraph/intern/nodes/deg_node_id.cc b/source/blender/depsgraph/intern/nodes/deg_node_id.cc
index 5839cf11e67..fbe61544cd0 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_id.cc
@@ -230,7 +230,7 @@ IDComponentsMask IDDepsNode::get_visible_components_mask() const {
 		if (comp_node->affects_directly_visible) {
 			const int component_type = comp_node->type;
 			BLI_assert(component_type < 64);
-			result |= (1UL << component_type);
+			result |= (1ULL << component_type);
 		}
 	}
 	GHASH_FOREACH_END();



More information about the Bf-blender-cvs mailing list