archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.81-release'

Browse Source
This commit is contained in:
Campbell Barton
2019-11-18 16:39:01 +11:00
parent 6d9d24e3d4 321afe0cd6
commit dfc232f892
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/intern/draw_manager.h
View File

@@ -409,7 +409,10 @@ typedef struct DRWCommandSmallChunk {
DRWCommand commands[6]; DRWCommand commands[6];
} DRWCommandSmallChunk; } DRWCommandSmallChunk;
/* Only true for 64-bit platforms. */
#ifdef __LP64__
BLI_STATIC_ASSERT_ALIGN(DRWCommandChunk, 16); BLI_STATIC_ASSERT_ALIGN(DRWCommandChunk, 16);
#endif
/* ------------- DRAW DEBUG ------------ */ /* ------------- DRAW DEBUG ------------ */

2
source/blender/makesrna/intern/rna_depsgraph.c
View File

@@ -255,7 +255,7 @@ static void rna_Depsgraph_debug_stats(Depsgraph *depsgraph, char *result)
DEG_stats_simple(depsgraph, &outer, &ops, &rels); DEG_stats_simple(depsgraph, &outer, &ops, &rels);
BLI_snprintf(result, BLI_snprintf(result,
STATS_MAX_SIZE, STATS_MAX_SIZE,
"Approx %lu Operations, %lu Relations, %lu Outer Nodes", "Approx %zu Operations, %zu Relations, %zu Outer Nodes",
ops, ops,
rels, rels,
outer); outer);