[Bf-blender-cvs] [380f07d0eec] master: draw_manager: fix warning with msvc.

Ray Molenkamp noreply at git.blender.org
Mon May 27 16:11:23 CEST 2019


Commit: 380f07d0eecc4515bf919ff8d6e8ffb81b36fa39
Author: Ray Molenkamp
Date:   Mon May 27 08:10:51 2019 -0600
Branches: master
https://developer.blender.org/rB380f07d0eecc4515bf919ff8d6e8ffb81b36fa39

draw_manager: fix warning with msvc.

32 bit shift stored in 64 bit field gave a warning with MSVC.

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

M	source/blender/draw/intern/draw_manager_exec.c

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

diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 8c4acb1f2d2..b232cfd01ad 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -593,7 +593,7 @@ enum {
 
 static void set_bound_flags(uint64_t *slots, uint64_t *persist_slots, int slot_idx, char bind_type)
 {
-  uint64_t slot = 1lu << (unsigned long)slot_idx;
+  uint64_t slot = 1llu << (unsigned long)slot_idx;
   *slots |= slot;
   if (bind_type == BIND_PERSIST) {
     *persist_slots |= slot;



More information about the Bf-blender-cvs mailing list