Commit: 321afe0cd61fbb1c5c4d778fa7564584b46c548c
Author: Campbell Barton
Date: Mon Nov 18 16:25:59 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB321afe0cd61fbb1c5c4d778fa7564584b46c548c
Fix building on 32bit systems
===================================================================
M source/blender/draw/intern/draw_manager.h
M source/blender/makesrna/intern/rna_depsgraph.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.h
b/source/blender/draw/intern/draw_manager.h
index 709116c78e5..ce8155dc85f 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -409,7 +409,10 @@ typedef struct DRWCommandSmallChunk {
DRWCommand commands[6];
} DRWCommandSmallChunk;
+/* Only true for 64-bit platforms. */
+#ifdef __LP64__
BLI_STATIC_ASSERT_ALIGN(DRWCommandChunk, 16);
+#endif
/* ------------- DRAW DEBUG ------------ */
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c
b/source/blender/makesrna/intern/rna_depsgraph.c
index 2072b07ecb3..b45b1117c2e 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -255,7 +255,7 @@ static void rna_Depsgraph_debug_stats(Depsgraph *depsgraph,
char *result)
DEG_stats_simple(depsgraph, &outer, &ops, &rels);
BLI_snprintf(result,
STATS_MAX_SIZE,
- "Approx %lu Operations, %lu Relations, %lu Outer Nodes",
+ "Approx %zu Operations, %zu Relations, %zu Outer Nodes",
ops,
rels,
outer);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
