Commit: a52f89a446566381c28804f0b1150aa71b245d59 Author: Joseph Eagar Date: Wed Sep 8 23:21:57 2021 -0800 Branches: temp_bmesh_multires https://developer.blender.org/rBa52f89a446566381c28804f0b1150aa71b245d59
Add more int casts for linux =================================================================== M source/blender/bmesh/intern/bmesh_log.c =================================================================== diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 486d61af377..2664ef542c1 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -2776,17 +2776,17 @@ static int bmlog_entry_memsize(BMLogEntry *entry) ret += entry->pdata.pool ? (int)BLI_mempool_get_size(entry->pdata.pool) : 0; // estimate ghash memory usage - ret += BLI_ghash_len(entry->added_verts) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->added_edges) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->added_faces) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->added_verts) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->added_edges) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->added_faces) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->modified_verts) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->modified_edges) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->modified_faces) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->modified_verts) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->modified_edges) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->modified_faces) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->deleted_verts) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->deleted_edges) * (int)sizeof(void *) * 4; - ret += BLI_ghash_len(entry->deleted_faces) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->deleted_verts) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->deleted_edges) * (int)sizeof(void *) * 4; + ret += (int)BLI_ghash_len(entry->deleted_faces) * (int)sizeof(void *) * 4; } else if (entry->type == LOG_ENTRY_FULL_MESH) { Mesh *me = entry->full_copy_mesh; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs