[Bf-blender-cvs] [9711cddbe0e] eevee-rewrite: EEVEE: Fix Windows 64bits error
Antonio Vazquez
noreply at git.blender.org
Mon Sep 13 17:02:19 CEST 2021
Commit: 9711cddbe0eb555fac40b80799f41d4b8c789a7f
Author: Antonio Vazquez
Date: Mon Sep 13 17:02:04 2021 +0200
Branches: eevee-rewrite
https://developer.blender.org/rB9711cddbe0eb555fac40b80799f41d4b8c789a7f
EEVEE: Fix Windows 64bits error
Windows is different of Linux
===================================================================
M source/blender/draw/intern/draw_manager_shader.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 08f728279a6..6651fd97779 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -590,7 +590,7 @@ static uint64_t drw_shader_dependencies_get(const DRWShaderLibrary *lib,
BLI_assert(0);
}
else {
- deps |= 1lu << (uint64_t)dep;
+ deps |= 1llu << ((uint64_t)dep);
}
}
return deps;
@@ -630,7 +630,7 @@ char *DRW_shader_library_create_shader_string(const DRWShaderLibrary *lib, const
DynStr *ds = BLI_dynstr_new();
/* Add all dependencies recursively. */
for (int i = MAX_LIB - 1; i > -1; i--) {
- if (lib->libs[i] && ((deps & (1lu << (uint64_t)i)) || (deps_post & (1lu << (uint64_t)i)))) {
+ if (lib->libs[i] && ((deps & (1llu << (uint64_t)i)) || (deps_post & (1llu << (uint64_t)i)))) {
deps |= lib->libs_deps[i];
}
}
More information about the Bf-blender-cvs
mailing list