diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-11-18 08:39:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-18 08:39:01 +0300 |
| commit | dfc232f892c38758c9d03cf33fb0300dce9dc02c (patch) | |
| tree | c83be599241f38441a374f779fc5000a050f63a4 | |
| parent | 6d9d24e3d4592a628e56fc10b177af63336474c4 (diff) | |
| parent | 321afe0cd61fbb1c5c4d778fa7564584b46c548c (diff) | |
Merge branch 'blender-v2.81-release'
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_depsgraph.c | 2 |
2 files changed, 4 insertions, 1 deletions
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); |